SONAR-3628 Possibility to customise the title of global widget

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
index 76bc1efe49b9114ab4586ea0f65ffb30d72feee3..5887e4999bf82ca89f3cbe16f1fdc0ac6da47767 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
@@ -1,6 +1,10 @@
 <%
-   @filter=::Filter.find(:first, :conditions => {:kee => widget_properties['filter']})
-   @filter_context=Filters.execute(@filter, self, params) unless @filter.ajax_loading?
+  @filter=::Filter.find(:first, :conditions => {:kee => widget_properties['filter']})
+  @filter_context=Filters.execute(@filter, self, params) unless @filter.ajax_loading?
+
+  name=@filter.name
+  period=period_names[@filter.period_index - 1] if @filter.period_index
+  @widget_title=[h(name), period].compact.join(' - ')
 %>
 
 <%= render :partial => "filters/#{@filter.default_view}", :locals => {:edit_mode => false, :widget => widget} %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index 803c7f16fb91d122e22feede8ee94dfdcd52c08d..fdbe448c5fc387ae96e979941847d3a1a4e046a0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -117,6 +117,13 @@ module DashboardHelper
     @project=@backup_project
     @snapshot=@backup_snapshot
     @dashboard_configuration=@backup_dashboard_configuration
+    @widget_title=nil
+  end
+
+  def widget_title(widget)
+    resource_name=h(@resource.name) if @resource && @dashboard.global && !widget.java_definition.global
+
+    [resource_name, @widget_title].compact.join(' - ')
   end
 
   def widget_body(widget)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb
index f9b4a7bcd5a257d4eb7eb45cefe9040ab3e89fd8..0c9fb7ae46838e18a3958ea7d29c61e83de577c1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_title.html.erb
@@ -1,7 +1,3 @@
-<% if widget.properties_as_hash['filter'] and @filter %>
-  <div class="widget-title" id="widget_title_<%= widget.id -%>">
-    <%= h @filter.name -%><% if @filter.period_index %>&nbsp;-&nbsp;<%= period_names[@filter.period_index-1] -%><% end %>
-  </div>
-<% elsif @dashboard.global and @resource and !widget.java_definition.global %>
-  <div class="widget-title" id="widget_title_<%= widget.id -%>"><%= h @resource.name -%></div>
+<% unless widget_title(widget).blank? %>
+  <div class="widget-title" id="widget_title_<%= widget.id -%>"><%= widget_title(widget) -%></div>
 <% end %>