SONAR-5007 Add languages next to quality profiles

diff --git a/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee b/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
index c36b02d58ba25e8afe5945cf696e9a5a3a4dcd16..5eda25095c47aaec6d4033a7f7de6b9e4d62fec4 100644 (file)
--- a/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
+++ b/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
@@ -8,10 +8,10 @@ define ['jquery.mockjax'], ->
     url: "#{baseUrl}/api/codingrules/app"
     responseText: JSON.stringify
       qualityprofiles: [
-        { key: 'sonarway', name: 'Sonar Way', parent: null },
-        { key: 'qualityprofile1', name: 'Quality Profile 1', parent: 'sonarway' },
-        { key: 'qualityprofile2', name: 'Quality Profile 2', parent: 'sonarway' },
-        { key: 'qualityprofile3', name: 'Quality Profile 3', parent: null },
+        { key: 'sonarway', name: 'Sonar Way', lang: 'Java', parent: null },
+        { key: 'qualityprofile1', name: 'Quality Profile 1', lang: 'Java', parent: 'sonarway' },
+        { key: 'qualityprofile2', name: 'Quality Profile 2', lang: 'JavaScript', parent: 'sonarway' },
+        { key: 'qualityprofile3', name: 'Quality Profile 3', lang: 'Java', parent: null },
       ]
       languages:
         java: 'Java'
@@ -275,10 +275,10 @@ define ['jquery.mockjax'], ->
     responseText: JSON.stringify
       more: false
       results: [
-        { id: 'sonarway', text: 'Sonar Way', parent: null },
-        { id: 'qp1', text: 'Quality Profile 1', parent: 'sonarway' },
-        { id: 'qp2', text: 'Quality Profile 2', parent: 'sonarway' },
-        { id: 'qp3', text: 'Quality Profile 3', parent: null },
+        { id: 'sonarway', text: 'Sonar Way', category: 'Java', parent: null },
+        { id: 'qp1', text: 'Quality Profile 1', category: 'Java', parent: 'sonarway' },
+        { id: 'qp2', text: 'Quality Profile 2', category: 'JavaScript', parent: 'sonarway' },
+        { id: 'qp3', text: 'Quality Profile 3', category: 'Java', parent: null },
       ]
 
 
@@ -287,5 +287,5 @@ define ['jquery.mockjax'], ->
     url: "#{baseUrl}/api/qualityprofiles/show"
     responseText: JSON.stringify
       qualityprofile:
-        id: 'sonarway', text: 'Sonar Way', parent: null
+        id: 'sonarway', text: 'Sonar Way', category: 'Java', parent: null
 

diff --git a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-bulk-change.hbs b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-bulk-change.hbs
index c8ecaab182106f0b985107f1e00d46264c37e1ab..7d7229132d55e18e84d9037d2cff71d6aab43ed3 100644 (file)
--- a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-bulk-change.hbs
+++ b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-bulk-change.hbs
@@ -19,7 +19,7 @@
         <label for="coding-rules-bulk-change-activate-on">{{t 'coding_rules.activate_in'}}</label>
         <select id="coding-rules-bulk-change-activate-on" multiple>
           {{#each activateOnQualityProfiles}}
-            <option value="{{key}}">{{name}}</option>
+            <option value="{{key}}">{{name}} ({{lang}})</option>
           {{/each}}
         </select>
       </div>
@@ -30,7 +30,7 @@
         <label for="coding-rules-bulk-change-deactivate-on">{{t 'coding_rules.deactivate_in'}}</label>
         <select id="coding-rules-bulk-change-deactivate-on" multiple>
           {{#each deactivateOnQualityProfiles}}
-            <option value="{{key}}">{{name}}</option>
+            <option value="{{key}}">{{name}} ({{lang}})</option>
           {{/each}}
         </select>
       </div>