From 254f2271ab9b6e99faf99e92bf5eb324e9dfbf8d Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 9 Aug 2011 10:17:36 +0200 Subject: [PATCH] SONAR-75 fix column titles in the filters page --- .../src/main/resources/org/sonar/l10n/core.properties | 7 +++++++ .../src/main/webapp/WEB-INF/app/helpers/filters_helper.rb | 2 -- .../src/main/webapp/WEB-INF/app/models/filter_column.rb | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index c103b691217..12e43941c36 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -350,6 +350,13 @@ filters.display_form.as=Display as filters.display_form.table=Table filters.display_form.treemap=Treemap filters.build_date=Build date +filters.col.date=Build date +filters.col.language=Language +filters.col.name=Name +filters.col.links=Links +filters.col.version=Version +filters.col.key=Key + #------------------------------------------------------------------------------ # diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb index 4f827a2823d..65e19f9fa90 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb @@ -110,9 +110,7 @@ module FiltersHelper end def column_title(column, filter) - html=nil if column.sortable? - asc = (column.descending? || column.sort_direction.nil?) html=link_to h(column.display_name), url_for(:overwrite_params => {:asc => (!(column.ascending?)).to_s, :sort => column.id}) else html=h(column.display_name) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb index 2af661559cf..50252c05764 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb @@ -39,9 +39,9 @@ class FilterColumn < ActiveRecord::Base def name if on_metric? - Api::Utils.message("metric." + kee + ".name", :default => (metric ? metric.short_name : kee)) + Api::Utils.message("metric.#{kee}.name", :default => (metric ? metric.short_name : kee)) else - Api::Utils.message(family, :default => kee) + Api::Utils.message("filters.col.#{family}", :default => kee) end end -- 2.39.5