From c0d6542bc1de1038f2efd2028af0e0575c4662cd Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 14 Mar 2014 12:54:39 +0600 Subject: [PATCH] SONAR-5142 Remove search of components by language --- .../WEB-INF/app/views/measures/_languages.html.erb | 8 -------- .../WEB-INF/app/views/measures/search.html.erb | 3 --- .../src/main/webapp/javascripts/measures/app.js | 13 ------------- 3 files changed, 24 deletions(-) delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/measures/_languages.html.erb diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_languages.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_languages.html.erb deleted file mode 100644 index 35a14ca97e5..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_languages.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -{ -<% Api::Utils.languages.each do |lang| %> - '<%= h lang.key -%>': '<%= h lang.name -%>', -<% end %> -} - - - diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb index d056480a983..8355b6ac94a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb @@ -52,7 +52,6 @@ _.extend(window.SS, { qualifiers: <%= render :partial => 'measures/qualifiers' -%>, - languages: <%= render :partial => 'measures/languages' -%>, <% condition_metrics = Metric.all.select { |m| m.numeric? && !m.hidden } %> metrics: <%= condition_metrics.to_json -%>, metricPeriods: { @@ -81,7 +80,6 @@ 'date': '<%= escape_javascript message('measure_filter.criteria.date') -%>', 'favoritesOnly': '<%= escape_javascript message('measure_filter.criteria.only_favorites') -%>', 'keyContains': '<%= escape_javascript message('measure_filter.criteria.key_contains') -%>', - 'language': '<%= escape_javascript message('measure_filter.criteria.language') -%>', 'lastAnalysis': '<%= escape_javascript message('measure_filter.criteria.last_analysis') -%>', 'metric': '<%= escape_javascript message('measure_filter.criteria.metric') -%>', 'notSet': '<%= escape_javascript message('measure_filter.criteria.metric.not_set') -%>', @@ -115,7 +113,6 @@ <% end %> { key: 'onFavourites', value: <%= @filter.criteria['onFavourites']=='true' -%> }, { key: 'keySearch', value: '<%= h @filter.criteria['keySearch'] -%>' }, - { key: 'languages[]', value: <%= @filter.criteria['languages'].to_json -%> }, <% for i in 1..3 %> <% unless @filter.criteria("c#{i}_metric").blank? %> diff --git a/sonar-server/src/main/webapp/javascripts/measures/app.js b/sonar-server/src/main/webapp/javascripts/measures/app.js index 19ec908aa89..dff79a245c7 100644 --- a/sonar-server/src/main/webapp/javascripts/measures/app.js +++ b/sonar-server/src/main/webapp/javascripts/measures/app.js @@ -120,19 +120,6 @@ requirejs( }) ]); - if (_.isObject(window.SS.languages) && _.size(window.SS.languages) > 1) { - this.filters.add([ - new BaseFilters.Filter({ - name: window.SS.phrases.language, - property: 'languages[]', - type: ChoiceFilters.ChoiceFilterView, - enabled: false, - optional: true, - choices: window.SS.languages - }) - ]); - } - this.filters.add([ new BaseFilters.Filter({ name: window.SS.phrases.lastAnalysis, -- 2.39.5