From 5ff8eae351db03fb8f1051e5bc8816267af3727e Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 30 Nov 2012 16:38:59 +0100 Subject: [PATCH] SONAR-3825 improve render of LEVEL metrics --- .../src/main/webapp/WEB-INF/app/helpers/measures_helper.rb | 2 +- .../webapp/WEB-INF/app/models/measure_filter_display_list.rb | 4 ++++ sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb | 2 +- .../main/webapp/WEB-INF/app/views/measures/search.html.erb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb index 9898d17773d..6417dbae590 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb @@ -31,7 +31,7 @@ module MeasuresHelper if filter.sort_key==column.key html << (filter.sort_asc? ? image_tag("asc12.png") : image_tag("desc12.png")) end - "#{html}" + "#{html}" end def list_cell_html(column, result) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb index 7c2077324f1..7046b17e354 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb @@ -49,6 +49,10 @@ class MeasureFilterDisplayList < MeasureFilterDisplay end end + def css_title + 'thin' if @metric && @metric.val_type==Metric::VALUE_TYPE_LEVEL + end + def sort? !links? end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb index 76766b13e5d..7f37caf97c8 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/widget.rb @@ -78,7 +78,7 @@ class Widget < ActiveRecord::Base end def java_definition - Java::OrgSonarServerUi::JRubyFacade.getInstance().getWidget(key) + Api::Utils.java_facade.getWidget(key) end def layout 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 919befc0e86..f1052353d1e 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 @@ -177,7 +177,7 @@ - +