From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 22 Apr 2014 12:48:29 +0000 (+0200)
Subject: SONAR-5118 Add language criterion in issues search page
X-Git-Tag: 4.4-RC1~1425
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8676a96880c5d94eeed3d1407166704499d22875;p=sonarqube.git

SONAR-5118 Add language criterion in issues search page
---

diff --git a/sonar-server/src/main/js/issues/app.js b/sonar-server/src/main/js/issues/app.js
index 86dc3f5794c..759312cec71 100644
--- a/sonar-server/src/main/js/issues/app.js
+++ b/sonar-server/src/main/js/issues/app.js
@@ -212,6 +212,15 @@ requirejs(
             format: function(value) { return moment(value).format('YYYY-MM-DD HH:mm'); }
           }),
 
+          new BaseFilters.Filter({
+            name: window.SS.phrases.language,
+            property: 'languages',
+            type: ChoiceFilters.ChoiceFilterView,
+            enabled: false,
+            optional: true,
+            choices: window.SS.languages
+          }),
+
           new BaseFilters.Filter({
             name: window.SS.phrases.reporter,
             property: 'reporters',
@@ -227,7 +236,6 @@ requirejs(
             enabled: false,
             optional: true
           })
-
         ]);
 
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index f4447319d49..cba925a13ba 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -46,6 +46,9 @@
     statuses: <%= @options_for_statuses.to_json.html_safe -%>,
     resolutions: <%= @options_for_resolutions.to_json.html_safe -%>,
     favorites: <%= render :partial => 'issues/filter_favourites' -%>,
+    languages: {<% controller.java_facade.getLanguages().to_a.sort {|a,b| a.getName() <=> b.getName()}.each do |language| -%>
+      '<%= language.getKey().html_safe -%>': '<%= language.getName().html_safe -%>',
+    <% end %>},
 
     phrases: {
       'actionPlan':    '<%= escape_javascript message('issue_filter.criteria.actionPlan') -%>',
@@ -57,6 +60,7 @@
       'delete':        '<%= escape_javascript message('delete') -%>',
       'to':            '<%= escape_javascript message('to.downcase') -%>',
       'project':       '<%= escape_javascript message('issue_filter.criteria.project') -%>',
+      'language':       '<%= escape_javascript message('language') -%>',
       'severity':      '<%= escape_javascript message('issue_filter.criteria.severity') -%>',
       'severities': {
         BLOCKER:       '<%= escape_javascript message('severity.BLOCKER') -%>',