SONAR-1927 Simplify Filter 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 b3823af73edbf1c123f85faa578467b10cd1409c..c827262043ff0da48117184f676d6655a97c4075 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 +1,6 @@
-<%= render :partial => 'filters/widget', :locals => {:filter_id => widget_properties['filter']} -%>
\ No newline at end of file
+<%
+   @filter=::Filter.find(widget_properties['filter'])
+   @filter_context=Filters.execute(@filter, self, params)
+%>
+
+<%= render :partial => "filters/#{@filter.default_view}", :locals => {:edit_mode => false} %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_widget.html.erb
deleted file mode 100644 (file)
index 087605a..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_widget.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%
-   @filter=::Filter.find(filter_id)
-   @filter_context=Filters.execute(@filter, self, params)
-%>
-
-<%= render :partial => "filters/#{@filter.default_view}", :locals => {:edit_mode => false} %>