SONAR-5718 Add language labels

diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index 56ddd0b4309e2e71366f9f609682928499d174c5..e0db4b8dcda8092d96ae520faab2add6ab2768cd 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -15,7 +15,7 @@ define [
   PAGE_SIZE = 50
   ALL_FACETS = ['severities', 'statuses', 'resolutions', 'componentRootUuids', 'assignees', 'reporters', 'rules',
                 'languages', 'actionPlans', 'componentUuids', 'creationDate']
-  FACET_DATA_FIELDS = ['components', 'projects', 'users', 'rules', 'actionPlans']
+  FACET_DATA_FIELDS = ['components', 'projects', 'users', 'rules', 'actionPlans', 'languages']
   FACETS_FROM_SERVER = ['severities', 'statuses', 'resolutions', 'actionPlans', 'componentRootUuids', 'rules',
                         'assignees', 'reporters', 'componentUuids', 'languages']
 

diff --git a/server/sonar-web/src/main/coffee/issues/facets-view.coffee b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
index 55626becb07c215420f981c7e2cf8eee70531c50..a36652b06a1e3256d2405179ca1eb40f2e3943bc 100644 (file)
--- a/server/sonar-web/src/main/coffee/issues/facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
@@ -12,6 +12,7 @@ define [
   'issues/facets/action-plan-facet'
   'issues/facets/component-facet'
   'issues/facets/reporter-facet'
+  'issues/facets/language-facet'
 ], (
   Marionette
   BaseFacet
@@ -25,6 +26,7 @@ define [
   ActionPlanFacet
   ComponentFacet
   ReporterFacet
+  LanguageFacet
 ) ->
 
   class extends Marionette.CollectionView
@@ -43,6 +45,7 @@ define [
         when 'actionPlans' then ActionPlanFacet
         when 'componentUuids' then ComponentFacet
         when 'reporters' then ReporterFacet
+        when 'languages' then LanguageFacet
         else BaseFacet
 
 

diff --git a/server/sonar-web/src/main/coffee/issues/facets/language-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/language-facet.coffee
new file mode 100644 (file)
index 0000000..475de37
--- /dev/null
+++ b/server/sonar-web/src/main/coffee/issues/facets/language-facet.coffee
@@ -0,0 +1,25 @@
+define [
+  'issues/facets/base-facet'
+], (
+  BaseFacet
+) ->
+
+
+  class extends BaseFacet
+
+    getValuesWithLabels: ->
+      values = @model.getValues()
+      source = @options.app.facets.languages
+      values.forEach (v) =>
+        key = v.val
+        label = null
+        if key
+          item = _.findWhere source, key: key
+          label = item.name if item?
+        v.label = label
+      values
+
+
+    serializeData: ->
+      _.extend super,
+        values: @getValuesWithLabels()