comparison app/controllers/project_enumerations_controller.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children e248c7af89ec
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
27 end 27 end
28 end 28 end
29 flash[:notice] = l(:notice_successful_update) 29 flash[:notice] = l(:notice_successful_update)
30 end 30 end
31 31
32 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project 32 redirect_to settings_project_path(@project, :tab => 'activities')
33 end 33 end
34 34
35 def destroy 35 def destroy
36 @project.time_entry_activities.each do |time_entry_activity| 36 @project.time_entry_activities.each do |time_entry_activity|
37 time_entry_activity.destroy(time_entry_activity.parent) 37 time_entry_activity.destroy(time_entry_activity.parent)
38 end 38 end
39 flash[:notice] = l(:notice_successful_update) 39 flash[:notice] = l(:notice_successful_update)
40 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project 40 redirect_to settings_project_path(@project, :tab => 'activities')
41 end 41 end
42
43 end 42 end