diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-23 17:55:43 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-23 17:56:02 +0200 |
| commit | e2ffcaf4cdf595c3fbb1e93f4679d026de046664 (patch) | |
| tree | 7767ca1d342badf185ade62c63965818d2efdb94 /sonar-server/src | |
| parent | e76b49e6a11cc9b5d18f88105e24e697e4443ceb (diff) | |
| download | sonarqube-e2ffcaf4cdf595c3fbb1e93f4679d026de046664.tar.gz sonarqube-e2ffcaf4cdf595c3fbb1e93f4679d026de046664.zip | |
SONAR-5007 SONAR-5137 Filter quality profiles on rule language for activation
Diffstat (limited to 'sonar-server/src')
3 files changed, 7 insertions, 5 deletions
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 ec05d9868cd..e6cd2a25fda 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 @@ -74,7 +74,7 @@ define [ qualityProfiles: qualityProfiles @listenTo @contextProfile, 'destroy', @hideContext - @model.set 'lang', @options.app.languages[@model.get 'lang'] + @model.set 'language', @options.app.languages[@model.get 'lang'] repoKey = @model.get 'repo' @model.set 'repository', _.find(@options.app.repositories, (repo) -> repo.key == repoKey).name @model.set 'canWrite', @options.app.canWrite 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 b61623b8be8..28fdf5185eb 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 @@ -96,10 +96,12 @@ define [ @$el.dialog 'close' - getAvailableQualityProfiles: -> + getAvailableQualityProfiles: (lang) -> activeQualityProfiles = @options.app.detailView.qualityProfilesView.collection - _.reject @options.app.qualityProfiles, (profile) => + inactiveProfiles = _.reject @options.app.qualityProfiles, (profile) => activeQualityProfiles.findWhere key: profile.key + _.filter inactiveProfiles, (profile) => + profile.lang == lang serializeData: -> @@ -114,5 +116,5 @@ define [ rule: @rule.toJSON() change: @model && @model.has 'severity' params: params - qualityProfiles: @getAvailableQualityProfiles() + qualityProfiles: @getAvailableQualityProfiles(@rule.get 'lang') severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'] diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs index 25cec748f3c..c340269d022 100644 --- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs +++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs @@ -10,7 +10,7 @@ <ul class="coding-rules-detail-properties"> <li class="coding-rules-detail-property">{{severityIcon severity}} {{t "severity" severity}}</li> <li class="coding-rules-detail-property"> - <span class="coding-rules-detail-status">{{lang}}</span> + <span class="coding-rules-detail-status">{{language}}</span> </li> {{#notEq status 'READY'}} <li class="coding-rules-detail-property"> |