SONAR-3825 keep display parameters when re-executing the search

1 files changed, 11 insertions, 3 deletions

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 c273a4022b2..26f15dac1b9 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
@@ -4,12 +4,20 @@
    color_metric = widget_properties['colorMetric']
    filter = MeasureFilter.find_by_id(filter_id.to_i) if filter_id
    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('tmSize', size_metric.key) if size_metric
-     filter.set_criteria_value('tmColor', color_metric.key) if color_metric
+     if size_metric
+      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
+     end
      filter.execute(self, :user => current_user)
-     @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'treemap'}
+
+     @widget_title = link_to h(filter.name), url_options
 %>
   <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget => widget, :filter => filter} %>
 <% end %>
\ No newline at end of file