Skip to content

O
OHR Support
Commit bf7476af authored by Eric Davis's avatar Eric Davis
Browse files
Options

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
parent 2295b61c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 31 deletions
app/controllers/projects_controller.rb
View file @ bf7476af
...@@ -25,13 +25,16 @@ class ProjectsController < ApplicationController ...@@ -25,13 +25,16 @@ class ProjectsController < ApplicationController
before_filter :authorize_global, :only => [:new, :create] before_filter :authorize_global, :only => [:new, :create]
before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
accept_key_auth :index 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? if controller.request.post?
controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt' controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
end end
end end
# TODO: convert to PUT only
verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
helper :sort helper :sort
include SortHelper include SortHelper
helper :custom_fields helper :custom_fields
...@@ -179,28 +182,27 @@ class ProjectsController < ApplicationController ...@@ -179,28 +182,27 @@ class ProjectsController < ApplicationController
@wiki ||= @project.wiki @wiki ||= @project.wiki
end end
# Edit @project
def edit 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 else
@project.attributes = params[:project] respond_to do |format|
if validate_parent_id && @project.save format.html {
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') settings
respond_to do |format| render :action => 'settings'
format.html { }
flash[:notice] = l(:notice_successful_update) format.xml { render :xml => @project.errors, :status => :unprocessable_entity }
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
end end
end end
end end
......
app/views/projects/_edit.rhtml
View file @ bf7476af
<% 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 } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
<% end %> <% end %>
config/routes.rb
View file @ bf7476af
...@@ -198,13 +198,14 @@ ActionController::Routing::Routes.draw do |map| ...@@ -198,13 +198,14 @@ ActionController::Routing::Routes.draw do |map|
project_actions.connect 'projects/new', :action => 'create' project_actions.connect 'projects/new', :action => 'create'
project_actions.connect 'projects', :action => 'create' project_actions.connect 'projects', :action => 'create'
project_actions.connect 'projects.:format', :action => 'create', :format => /xml/ 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/files/new', :controller => 'files', :action => 'new'
project_actions.connect 'projects/:id/activities/save', :controller => 'project_enumerations', :action => 'save' project_actions.connect 'projects/:id/activities/save', :controller => 'project_enumerations', :action => 'save'
end end
projects.with_options :conditions => {:method => :put} do |project_actions| 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 end
projects.with_options :conditions => {:method => :delete} do |project_actions| projects.with_options :conditions => {:method => :delete} do |project_actions|
......
lib/redmine.rb
View file @ bf7476af
...@@ -47,7 +47,7 @@ Redmine::AccessControl.map do |map| ...@@ -47,7 +47,7 @@ Redmine::AccessControl.map do |map|
map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
map.permission :search_project, {:search => :index}, :public => true map.permission :search_project, {:search => :index}, :public => true
map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin 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 :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_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 map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :close_completed, :destroy]}, :require => :member
......
test/functional/projects_controller_test.rb
View file @ bf7476af
...@@ -318,9 +318,9 @@ class ProjectsControllerTest < ActionController::TestCase ...@@ -318,9 +318,9 @@ class ProjectsControllerTest < ActionController::TestCase
assert_template 'settings' assert_template 'settings'
end end
def test_edit def test_update
@request.session[:user_id] = 2 # manager @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 => ['']} :issue_custom_field_ids => ['']}
assert_redirected_to 'projects/ecookbook/settings' assert_redirected_to 'projects/ecookbook/settings'
project = Project.find(1) project = Project.find(1)
......
test/integration/routing_test.rb
View file @ bf7476af
...@@ -180,14 +180,14 @@ class RoutingTest < ActionController::IntegrationTest ...@@ -180,14 +180,14 @@ class RoutingTest < ActionController::IntegrationTest
should_route :post, "/projects/new", :controller => 'projects', :action => 'create' should_route :post, "/projects/new", :controller => 'projects', :action => 'create'
should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml' 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/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/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/archive", :controller => 'projects', :action => 'archive', :id => '64'
should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :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 :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/1.xml", :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
should_route :delete, "/projects/64/reset_activities", :controller => 'project_enumerations', :action => 'destroy', :id => '64' should_route :delete, "/projects/64/reset_activities", :controller => 'project_enumerations', :action => 'destroy', :id => '64'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment