Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/issue_categories_controller.rb.svn-base @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 513646585e45 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/issue_categories_controller.rb.svn-base Thu Mar 03 11:42:28 2011 +0000 +++ b/app/controllers/.svn/text-base/issue_categories_controller.rb.svn-base Mon Jun 06 14:24:13 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