comparison .svn/pristine/05/05fb4e3ebed828cf639f80e5d1d6da6095d43000.svn-base @ 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
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 # Redmine - project management software
2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 #
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
8 #
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
13 #
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
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
18 class ProjectEnumerationsController < ApplicationController
19 before_filter :find_project_by_project_id
20 before_filter :authorize
21
22 def update
23 if request.put? && params[:enumerations]
24 Project.transaction do
25 params[:enumerations].each do |id, activity|
26 @project.update_or_create_time_entry_activity(id, activity)
27 end
28 end
29 flash[:notice] = l(:notice_successful_update)
30 end
31
32 redirect_to settings_project_path(@project, :tab => 'activities')
33 end
34
35 def destroy
36 @project.time_entry_activities.each do |time_entry_activity|
37 time_entry_activity.destroy(time_entry_activity.parent)
38 end
39 flash[:notice] = l(:notice_successful_update)
40 redirect_to settings_project_path(@project, :tab => 'activities')
41 end
42 end