comparison 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
comparison
equal deleted inserted replaced
245:051f544170fe 441:cbce1fd3b1b7
63 @issue_count = @category.issues.size 63 @issue_count = @category.issues.size
64 if @issue_count == 0 64 if @issue_count == 0
65 # No issue assigned to this category 65 # No issue assigned to this category
66 @category.destroy 66 @category.destroy
67 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' 67 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
68 return
68 elsif params[:todo] 69 elsif params[:todo]
69 reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign' 70 reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
70 @category.destroy(reassign_to) 71 @category.destroy(reassign_to)
71 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' 72 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
73 return
72 end 74 end
73 @categories = @project.issue_categories - [@category] 75 @categories = @project.issue_categories - [@category]
74 end 76 end
75 77
76 private 78 private