@@ -1,42 +1,44 | |||||
1 | # Redmine - project management software |
|
1 | # Redmine - project management software | |
2 | # Copyright (C) 2006-2015 Jean-Philippe Lang |
|
2 | # Copyright (C) 2006-2015 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. | |
8 | # |
|
8 | # | |
9 | # This program is distributed in the hope that it will be useful, |
|
9 | # This program is distributed in the hope that it will be useful, | |
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | # GNU General Public License for more details. |
|
12 | # GNU General Public License for more details. | |
13 | # |
|
13 | # | |
14 | # You should have received a copy of the GNU General Public License |
|
14 | # You should have received a copy of the GNU General Public License | |
15 | # along with this program; if not, write to the Free Software |
|
15 | # along with this program; if not, write to the Free Software | |
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | class ProjectEnumerationsController < ApplicationController |
|
18 | class ProjectEnumerationsController < ApplicationController | |
19 | before_filter :find_project_by_project_id |
|
19 | before_filter :find_project_by_project_id | |
20 | before_filter :authorize |
|
20 | before_filter :authorize | |
21 |
|
21 | |||
22 | def update |
|
22 | def update | |
23 | if params[:enumerations] |
|
23 | if params[:enumerations] | |
24 | Project.transaction do |
|
24 | saved = Project.transaction do | |
25 | params[:enumerations].each do |id, activity| |
|
25 | params[:enumerations].each do |id, activity| | |
26 | @project.update_or_create_time_entry_activity(id, activity) |
|
26 | @project.update_or_create_time_entry_activity(id, activity) | |
27 | end |
|
27 | end | |
28 | end |
|
28 | end | |
29 | flash[:notice] = l(:notice_successful_update) |
|
29 | if saved | |
|
30 | flash[:notice] = l(:notice_successful_update) | |||
|
31 | end | |||
30 | end |
|
32 | end | |
31 |
|
33 | |||
32 | redirect_to settings_project_path(@project, :tab => 'activities') |
|
34 | redirect_to settings_project_path(@project, :tab => 'activities') | |
33 | end |
|
35 | end | |
34 |
|
36 | |||
35 | def destroy |
|
37 | def destroy | |
36 | @project.time_entry_activities.each do |time_entry_activity| |
|
38 | @project.time_entry_activities.each do |time_entry_activity| | |
37 | time_entry_activity.destroy(time_entry_activity.parent) |
|
39 | time_entry_activity.destroy(time_entry_activity.parent) | |
38 | end |
|
40 | end | |
39 | flash[:notice] = l(:notice_successful_update) |
|
41 | flash[:notice] = l(:notice_successful_update) | |
40 | redirect_to settings_project_path(@project, :tab => 'activities') |
|
42 | redirect_to settings_project_path(@project, :tab => 'activities') | |
41 | end |
|
43 | end | |
42 | end |
|
44 | end |
General Comments 0
You need to be logged in to leave comments.
Login now