From 0c4af8d9808eb04c9e7100a2ac1331ffadb44e41 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 17 Jan 2013 16:53:36 +0100 Subject: [PATCH] SONAR-3991 The behavior of the metric selector component is broken when adding several instances of the same project widget to a global dashboard --- .../webapp/WEB-INF/app/helpers/widget_properties_helper.rb | 3 ++- .../WEB-INF/app/views/dashboard/_widget_properties.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb index 1766c94faff..a6e161cecdb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb @@ -21,7 +21,8 @@ module WidgetPropertiesHelper include PropertiesHelper def property_value_field(definition, value, widget) - property_input_field definition.key, definition.type.name, value.nil? ? definition.defaultValue : value, definition.options, {:html_id => "prop-#{widget.key.parameterize}-#{definition.key.parameterize}"} + property_input_field definition.key, definition.type.name, value.nil? ? definition.defaultValue : value, definition.options, + {:html_id => "prop-#{widget.id}-#{widget.key.parameterize}-#{definition.key.parameterize}"} end end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb index 4257bf72677..72970d01683 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_properties.html.erb @@ -15,7 +15,7 @@ :resource_type_property => 'supportsGlobalDashboards', :selected_resource => widget.resource, :width => '250px', - :html_id => "widget-select-prj-#{widget.key.parameterize}"} -%> + :html_id => "widget-#{widget.id}-select-prj-#{widget.key.parameterize}"} -%> <% end %> -- 2.39.5