diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-23 16:30:12 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-23 16:54:25 +0200 |
| commit | a851282abcfa5de5ea4f8f0e328df64a662261c0 (patch) | |
| tree | 8505ac23d2c2598a6fa9626523bc6380ba13932b /sonar-server/src/main/coffee | |
| parent | 62f4328dcc91dc9686e59a556acb993c159fefc9 (diff) | |
| download | sonarqube-a851282abcfa5de5ea4f8f0e328df64a662261c0.tar.gz sonarqube-a851282abcfa5de5ea4f8f0e328df64a662261c0.zip | |
SONAR-5007 Fix display of facets, translations, paging, filters
Diffstat (limited to 'sonar-server/src/main/coffee')
3 files changed, 13 insertions, 10 deletions
diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee index 100614eb00d..ff01752e8fe 100644 --- a/sonar-server/src/main/coffee/coding-rules/app.coffee +++ b/sonar-server/src/main/coffee/coding-rules/app.coffee @@ -116,7 +116,7 @@ requirejs [ App.fetchList = (firstPage, fromFacets) -> query = @getQuery() - fetchQuery = _.extend { p: @pageIndex, facets: !fromFacets }, query + fetchQuery = _.extend { p: @pageIndex, ps: 25, facets: !fromFacets }, query if @codingRulesFacetsView _.extend fetchQuery, @codingRulesFacetsView.getQuery() @@ -177,10 +177,7 @@ requirejs [ App.facetLabel = (property, value) -> return value unless App.facetPropertyToLabels[property] - if App.facetPropertyToLabels[property][value] - return App.facetPropertyToLabels[property][value] - else - return _.findWhere(App.facetPropertyToLabels[property], key: value).name + App.facetPropertyToLabels[property](value) App.fetchFirstPage = (fromFacets = false) -> @@ -300,8 +297,8 @@ requirejs [ multiple: false qualityProfileFilter: @qualityProfileFilter choices: - 'true': t 'coding_rules.filters.activation.active' - 'false': t 'coding_rules.filters.activation.inactive' + true: t 'coding_rules.filters.activation.active' + false: t 'coding_rules.filters.activation.inactive' @filters.add @activationFilter @filters.add new BaseFilters.Filter @@ -369,8 +366,10 @@ requirejs [ App.characteristics = r.characteristics App.facetPropertyToLabels = - 'languages': App.languages - 'repositories': App.repositories + 'languages': (value) -> App.languages[value] + 'repositories': (value) -> + repo = _.findWhere(App.repositories, key: value) + repo.name + ' - ' + App.languages[repo.language] # Message bundles l10nXHR = window.requestMessages() diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee index 3eae915bf2c..ec05d9868cd 100644 --- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee +++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee @@ -63,7 +63,7 @@ define [ qualityProfile = @options.app.getQualityProfile() if qualityProfile - @contextProfile = qualityProfiles.findWhere key: qualityProfile + @contextProfile = qualityProfiles.findWhere qProfile: qualityProfile unless @contextProfile @contextProfile = new Backbone.Model key: qualityProfile, name: @options.app.qualityProfileFilter.view.renderValue() @@ -71,6 +71,7 @@ define [ app: @options.app model: @contextProfile rule: @model + qualityProfiles: qualityProfiles @listenTo @contextProfile, 'destroy', @hideContext @model.set 'lang', @options.app.languages[@model.get 'lang'] @@ -81,6 +82,7 @@ define [ @model.set 'createdAt', new Date(@model.get 'createdAt') onRender: -> + @$el.find('.open-modal').modal(); @qualityProfilesRegion.show @qualityProfilesView if @options.app.getQualityProfile() diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee index 49df39f8805..b61623b8be8 100644 --- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee +++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee @@ -32,6 +32,8 @@ define [ if @model profileKey = @model.get('qProfile') + unless profileKey + profileKey = @model.get('key') severity = @ui.qualityProfileSeverity.val() @$('.modal-foot').html '<i class="spinner"></i>' |