Refactor: split method ProjectsController#edit to ProjectsController#update.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4070 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 376034097a5630ce9843b2159c66f495fa694e50..f1634932915b104259f1d46c214f01c4a42e8287 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -25,13 +25,16 @@ class ProjectsController < ApplicationController
   before_filter :authorize_global, :only => [:new, :create]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
   accept_key_auth :index
-  
-  after_filter :only => [:create, :edit, :archive, :unarchive, :destroy] do |controller|
+
+  after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
     if controller.request.post?
       controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
     end
   end
-  
+
+  # TODO: convert to PUT only
+  verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
+
   helper :sort
   include SortHelper
   helper :custom_fields
@@ -179,28 +182,27 @@ class ProjectsController < ApplicationController
     @wiki ||= @project.wiki
   end
   
-  # Edit @project
   def edit
-    if request.get?
+  end
+
+  def update
+    @project.attributes = params[:project]
+    if validate_parent_id && @project.save
+      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
+      respond_to do |format|
+        format.html { 
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to :action => 'settings', :id => @project
+        }
+        format.xml  { head :ok }
+      end
     else
-      @project.attributes = params[:project]
-      if validate_parent_id && @project.save
-        @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
-        respond_to do |format|
-          format.html { 
-            flash[:notice] = l(:notice_successful_update)
-            redirect_to :action => 'settings', :id => @project
-          }
-          format.xml  { head :ok }
-        end
-      else
-        respond_to do |format|
-          format.html { 
-            settings
-            render :action => 'settings'
-          }
-          format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
-        end
+      respond_to do |format|
+        format.html { 
+          settings
+          render :action => 'settings'
+        }
+        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
       end
     end
   end

diff --git a/app/views/projects/_edit.rhtml b/app/views/projects/_edit.rhtml
index b7c2987d23f42c5c5c8f765637b8579e1a178e2f..dc667f2676806c040803cfe54e6f41ccfe64b581 100644 (file)
--- a/app/views/projects/_edit.rhtml
+++ b/app/views/projects/_edit.rhtml
@@ -1,4 +1,4 @@
-<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
+<% labelled_tabular_form_for :project, @project, :url => { :action => "update", :id => @project } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/config/routes.rb b/config/routes.rb
index 7f971da7c88371b6f30b5cd9f839fe31f34e2ede..01d6a5062be03a512c086372ef56c31612458c7d 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -198,13 +198,14 @@ ActionController::Routing::Routes.draw do |map|
       project_actions.connect 'projects/new', :action => 'create'
       project_actions.connect 'projects', :action => 'create'
       project_actions.connect 'projects.:format', :action => 'create', :format => /xml/
-      project_actions.connect 'projects/:id/:action', :action => /edit|destroy|archive|unarchive/
+      project_actions.connect 'projects/:id/edit', :action => 'update'
+      project_actions.connect 'projects/:id/:action', :action => /destroy|archive|unarchive/
       project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
       project_actions.connect 'projects/:id/activities/save', :controller => 'project_enumerations', :action => 'save'
     end
 
     projects.with_options :conditions => {:method => :put} do |project_actions|
-      project_actions.conditions 'projects/:id.:format', :action => 'edit', :format => /xml/
+      project_actions.conditions 'projects/:id.:format', :action => 'update', :format => /xml/
     end
 
     projects.with_options :conditions => {:method => :delete} do |project_actions|

diff --git a/lib/redmine.rb b/lib/redmine.rb
index dcddeb9025b9571b7893618fd4d84e624674f1d5..534f8587597fe815a9bd7232c44f7085c47cb476 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -47,7 +47,7 @@ Redmine::AccessControl.map do |map|
   map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
   map.permission :search_project, {:search => :index}, :public => true
   map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
-  map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
+  map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
   map.permission :select_project_modules, {:projects => :modules}, :require => :member
   map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
   map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :close_completed, :destroy]}, :require => :member

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index e661ca29e84536a5d2a332f6d3b55f08a4cd62eb..636cb17519ef95b0470154c38c72fc67864a3b34 100644 (file)
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -318,9 +318,9 @@ class ProjectsControllerTest < ActionController::TestCase
     assert_template 'settings'
   end
   
-  def test_edit
+  def test_update
     @request.session[:user_id] = 2 # manager
-    post :edit, :id => 1, :project => {:name => 'Test changed name',
+    post :update, :id => 1, :project => {:name => 'Test changed name',
                                        :issue_custom_field_ids => ['']}
     assert_redirected_to 'projects/ecookbook/settings'
     project = Project.find(1)

diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index f43dc8a612987cb17ad889096ee8129ce2580fe2..0db45ce02311e0d0f180393c4d5c220822e8c6ed 100644 (file)
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -180,14 +180,14 @@ class RoutingTest < ActionController::IntegrationTest
     
     should_route :post, "/projects/new", :controller => 'projects', :action => 'create'
     should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml'
-    should_route :post, "/projects/4223/edit", :controller => 'projects', :action => 'edit', :id => '4223'
+    should_route :post, "/projects/4223/edit", :controller => 'projects', :action => 'update', :id => '4223'
     should_route :post, "/projects/64/destroy", :controller => 'projects', :action => 'destroy', :id => '64'
     should_route :post, "/projects/33/files/new", :controller => 'files', :action => 'new', :id => '33'
     should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64'
     should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64'
     should_route :post, "/projects/64/activities/save", :controller => 'project_enumerations', :action => 'save', :id => '64'
 
-    should_route :put, "/projects/1.xml", :controller => 'projects', :action => 'edit', :id => '1', :format => 'xml'
+    should_route :put, "/projects/1.xml", :controller => 'projects', :action => 'update', :id => '1', :format => 'xml'
 
     should_route :delete, "/projects/1.xml", :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
     should_route :delete, "/projects/64/reset_activities", :controller => 'project_enumerations', :action => 'destroy', :id => '64'