From: David Gageot Date: Mon, 7 May 2012 16:15:08 +0000 (+0200) Subject: SONAR-1927 Simplify Filter widget X-Git-Tag: 3.1~276 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c5b4ba2a3239810f825af566247472e74708357;p=sonarqube.git 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 b3823af73ed..c827262043f 100644 --- 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 index 087605a8a9b..00000000000 --- 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} %>