summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-02 17:39:56 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-02 17:39:56 +0000
commit83b4343d2d403a21de4614016e165091e4c5914f (patch)
tree52fed892e8c3363c238a1a9e36383e7c34923b5a /app
parentb5e90972d88c69a1ef2c9e90879e8926d192acff (diff)
downloadredmine-83b4343d2d403a21de4614016e165091e4c5914f.tar.gz
redmine-83b4343d2d403a21de4614016e165091e4c5914f.zip
Refactor: move method, ProjectsController#save_activities to ProjectEnumerationsController#save
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4053 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/project_enumerations_controller.rb18
-rw-r--r--app/controllers/projects_controller.rb13
-rw-r--r--app/views/projects/settings/_activities.rhtml2
3 files changed, 19 insertions, 14 deletions
diff --git a/app/controllers/project_enumerations_controller.rb b/app/controllers/project_enumerations_controller.rb
new file mode 100644
index 000000000..c4b48e476
--- /dev/null
+++ b/app/controllers/project_enumerations_controller.rb
@@ -0,0 +1,18 @@
+class ProjectEnumerationsController < ApplicationController
+ before_filter :find_project
+ before_filter :authorize
+
+ def save
+ if request.post? && params[:enumerations]
+ Project.transaction do
+ params[:enumerations].each do |id, activity|
+ @project.update_or_create_time_entry_activity(id, activity)
+ end
+ end
+ flash[:notice] = l(:notice_successful_update)
+ end
+
+ redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
+ end
+
+end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 61c7a7c71..0670cb1ec 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -238,19 +238,6 @@ class ProjectsController < ApplicationController
@project = nil
end
- def save_activities
- if request.post? && params[:enumerations]
- Project.transaction do
- params[:enumerations].each do |id, activity|
- @project.update_or_create_time_entry_activity(id, activity)
- end
- end
- flash[:notice] = l(:notice_successful_update)
- end
-
- redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
- end
-
def reset_activities
@project.time_entry_activities.each do |time_entry_activity|
time_entry_activity.destroy(time_entry_activity.parent)
diff --git a/app/views/projects/settings/_activities.rhtml b/app/views/projects/settings/_activities.rhtml
index d82bd96fb..e39bf9b91 100644
--- a/app/views/projects/settings/_activities.rhtml
+++ b/app/views/projects/settings/_activities.rhtml
@@ -1,4 +1,4 @@
-<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %>
+<% form_tag({:controller => 'project_enumerations', :action => 'save', :id => @project}, :class => "tabular") do %>
<table class="list">
<thead><tr>