SONAR-5007 SONAR-5137 Filter quality profiles on rule language for activation

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 ec05d9868cd1c6b2649c606c2f1e4e2bbf6e5d0c..e6cd2a25fda6a4266106c4c98bb1587133cec771 100644 (file)
--- 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 b61623b8be847fd842c7f506e80d3e7cebf5477c..28fdf5185eb5ae05d1b3788a0c11a65399b2f50f 100644 (file)
--- 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 25cec748f3cbf16ba0fb8680dac8837e81e5b25b..c340269d022b554b43e6af44aee14565c1e46c3e 100644 (file)
--- 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">