diff app/controllers/issue_categories_controller.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/app/controllers/issue_categories_controller.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/app/controllers/issue_categories_controller.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -65,10 +65,12 @@
       # No issue assigned to this category
       @category.destroy
       redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+      return
     elsif params[:todo]
       reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
       @category.destroy(reassign_to)
       redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+      return
     end
     @categories = @project.issue_categories - [@category]
   end