summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/coffee
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-server/src/main/coffee')
-rw-r--r--sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee2
-rw-r--r--sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee8
2 files changed, 6 insertions, 4 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']