SONAR-3825 ability to change existing filter without saving it

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
index 395b0f1690ff82c2379f1d2ba0f02511d1b022e8..bca19f33bed80472e7bc81b6dd4ebf1f011dda47 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
@@ -43,9 +43,7 @@ class MeasuresController < ApplicationController
 
     @filter = find_filter(params[:id])
     @filter.load_criteria_from_data
-    @filter.enable_default_display
-    @filter.execute(self, :user => current_user)
-    render :action => 'search'
+    redirect_to @filter.criteria.merge({:action => 'search', :id => params[:id]})
   end
 
   def save_form

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index 4a6dc80c25729d0cd5b440c44155c3732ffcbaf6..a1f56543664a0aa822e1192e94986e6ab0d45b1c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -33,7 +33,7 @@
       var url = decodeURI(window.location.href);
       $j.each(params, function (key, value) {
         url = removeUrlAttr(url, key);
-        url += '&'+ key + '=' + value;
+        url += '&' + key + '=' + value;
       });
       window.location = url;
     }
@@ -178,14 +178,18 @@
 
       <%
          edit_mode = (params[:edit]=='true')
-         unless edit_mode %>
+         unless edit_mode
+      %>
         Display as:
         <% MeasureFilterDisplay.keys.each do |display_key| %>
           <%= link_to_if display_key!=@filter.display.key, display_key, params.merge(:action => 'search', :display => display_key, :id => @filter.id) -%>
         <% end %>
         <a id="edit" href="<%= url_for params.merge({:edit => true, :id => @filter.id}) -%>" class="button"><%= message('configure') -%></a>
-        <% if logged_in? && (@filter.user_id==nil || @filter.user_id==current_user.id) %>
-          <a id="save_as" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('save') -%></a>
+        <% if logged_in? %>
+          <% if @filter.id==nil || @filter.user_id==current_user.id %>
+            <a id="save" href="<%= url_for params.merge({:action => 'save_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('save') -%></a>
+          <% end %>
+          <a id="copy" href="<%= url_for params.merge({:action => 'copy_form', :id => @filter.id}) -%>" class="button open-modal"><%= message('copy') -%></a>
         <% end %>
       <% end %>
       <%= render :partial => "measures/display_#{@filter.display.class::KEY}", :locals => {:edit_mode => edit_mode} -%>