diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-12 07:54:42 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-12 07:54:42 +0100 |
| commit | 2de6b4a37197ab978c104a87b7a8409bf0591dbd (patch) | |
| tree | 75f4bb8a58c5d188be5eef75e677862750b20080 /plugins | |
| parent | ce39ee5cefd82316c3941652625135659e67f764 (diff) | |
| download | sonarqube-2de6b4a37197ab978c104a87b7a8409bf0591dbd.tar.gz sonarqube-2de6b4a37197ab978c104a87b7a8409bf0591dbd.zip | |
SONAR-3825 widget should support column sorting and pagination
Diffstat (limited to 'plugins')
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb index dc3fcc37f0c..7ec7a3bbe7b 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb @@ -10,7 +10,7 @@ filter.execute(self, :user => current_user) @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'list'} %> - <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget => widget, :filter => filter} %> + <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :filter => filter, :widget_id => widget.id} -%> <% end else diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb index 9b8ac706d1e..53c2fae8967 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb @@ -6,14 +6,14 @@ if filter url_options = {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'treemap'} filter.load_criteria_from_data - filter.set_criteria_value('display', 'treemap') + filter.set_criteria_value(:display, 'treemap') if size_metric - filter.set_criteria_value('tmSize', size_metric.key) - url_options['tmSize']=size_metric.key + filter.set_criteria_value(:tmSize, size_metric.key) + url_options[:tmSize]=size_metric.key end if color_metric - filter.set_criteria_value('tmColor', color_metric.key) - url_options['tmColor']=color_metric.key + filter.set_criteria_value(:tmColor, color_metric.key) + url_options[:tmColor]=color_metric.key end if !filter.require_authentication? || logged_in? @@ -21,7 +21,7 @@ @widget_title = link_to h(filter.name), url_options %> - <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget => widget, :filter => filter} %> + <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget_id => widget.id, :filter => filter} %> <% end else |