jro_apps/redmine Commit - r4026:f74d9809fda7

Merged r4070 from trunk....

Eric Davis -

r4026:f74d9809fda7

parent child

Context file:

r4026:f74d9809fda7

Collapse all files

app/controllers/projects_controller.rb +25 -23

@@ -25,13 +25,16 class ProjectsController < ApplicationController
25	before_filter :authorize_global, :only => [:new, :create]	25	before_filter :authorize_global, :only => [:new, :create]
26	before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]	26	before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
27	accept_key_auth :index	27	accept_key_auth :index
28		28
29	after_filter :only => [:create, :edit, :archive, :unarchive, :destroy] do \|controller\|	29	after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do \|controller\|
30	if controller.request.post?	30	if controller.request.post?
31	controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'	31	controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
32	end	32	end
33	end	33	end
34		34
		35	# TODO: convert to PUT only
		36	verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
		37
35	helper :sort	38	helper :sort
36	include SortHelper	39	include SortHelper
37	helper :custom_fields	40	helper :custom_fields
@@ -179,28 +182,27 class ProjectsController < ApplicationController
179	@wiki \|\|= @project.wiki	182	@wiki \|\|= @project.wiki
180	end	183	end
181		184
182	# Edit @project
183	def edit	185	def edit
184	if request.get?	186	end
		187
		188	def update
		189	@project.attributes = params[:project]
		190	if validate_parent_id && @project.save
		191	@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
		192	respond_to do \|format\|
		193	format.html {
		194	flash[:notice] = l(:notice_successful_update)
		195	redirect_to :action => 'settings', :id => @project
		196	}
		197	format.xml { head :ok }
		198	end
185	else	199	else
186	@project.attributes = params[:project]	200	respond_to do \|format\|
187	if validate_parent_id && @project.save	201	format.html {
188	@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')	202	settings
189	respond_to do \|format\|	203	render :action => 'settings'
190	format.html {	204	}
191	flash[:notice] = l(:notice_successful_update)	205	format.xml { render :xml => @project.errors, :status => :unprocessable_entity }
192	redirect_to :action => 'settings', :id => @project
193	}
194	format.xml { head :ok }
195	end
196	else
197	respond_to do \|format\|
198	format.html {
199	settings
200	render :action => 'settings'
201	}
202	format.xml { render :xml => @project.errors, :status => :unprocessable_entity }
203	end
204	end	206	end
205	end	207	end
206	end	208	end

app/views/projects/_edit.rhtml +1 -1

-            <% 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 %>

config/routes.rb +3 -2

                   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|

lib/redmine.rb +1 -1

               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

test/functional/projects_controller_test.rb +2 -2

                 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)

test/integration/routing_test.rb +2 -2

                 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'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages