SONAR-4000 When deleting a resource in the bulk deletion page, the selected tab alway...

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb
index b667d4ccc0a82d9ae98342175aedf0ada955837b..5f1bb4f95cd8dfb7ab73b3ecfccc5ade2c618f3d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/bulk_deletion_controller.rb
@@ -101,7 +101,7 @@ class BulkDeletionController < ApplicationController
       # display the same page again and again
       # => implicit render "pending_deletions.html.erb"
     else
-      redirect_to :action => 'index'
+      redirect_to :action => 'index', :resource_type => params[:resource_type]
     end
   end
   
@@ -109,7 +109,7 @@ class BulkDeletionController < ApplicationController
     # It is important to reinit the ResourceDeletionManager so that the deletion screens can be available again
     ResourceDeletionManager.instance.reinit
     
-    redirect_to :action => 'index'
+    redirect_to :action => 'index', :resource_type => params[:resource_type]
   end
   
   private

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
index 5f4965695e7143d4098da5c3d28efb20450d896a..29d2118ae521c6b3e268f862c17327354631175e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
@@ -30,7 +30,7 @@
     <%= message('no_results') -%>
   <% else %>
 
-    <% form_remote_tag( :url => {:action => 'delete_resources'}, :loading => "window.location='#{url_for :action => 'pending_deletions'}';") do %>
+    <% form_remote_tag( :url => {:action => 'delete_resources'}, :loading => "window.location='#{url_for :action => 'pending_deletions', :resource_type => @selected_tab}';") do %>
 
     <table class="data" id="resources-to-delete">
       <tfoot>