SONAR-5718 Add languages to the rule facet

diff --git a/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
index cda1359592a3dfb1ebb59dce4d1b59129fbacb84..c4db10359f9d37ab0af053485d27df9a9739fd65 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/rule-facet.coffee
@@ -40,7 +40,7 @@ define [
         if key
           rule = _.findWhere rules, key: key
           label = rule.name if rule?
-          extra = rule.language if rule?
+          extra = rule.langName if rule?
         v.label = label
         v.extra = extra
       values

diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-custom-values-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-custom-values-facet.hbs
index 4334ca8a72bad4b9f726a683735db81215a8498c..0c86ed1bdf38ef77f6b47b4df9ea580ed333a59a 100644 (file)
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-custom-values-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-custom-values-facet.hbs
@@ -2,8 +2,8 @@
 
 <div class="issues-facet-list">
   {{#each values}}
-    <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{default label val}}">
-      <span class="facet-name">{{default label val}}</span>
+    <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{#if extra}}({{extra}}) {{default label val}}">
+      <span class="facet-name">{{/if}}{{default label val}}</span>
       <span class="facet-stat">{{count}}</span>
     </a>
   {{/each}}