jro_apps/redmine Commit - r4116:86ba692bf531

Refactor: split UsersController#edit into #edit and #update...

Eric Davis -

r4116:86ba692bf531

parent child

Context file:

r4116:86ba692bf531

Collapse all files

app/controllers/users_controller.rb +40 -29

@@ -116,40 +116,51 class UsersController < ApplicationController
116	@notification_options = @user.valid_notification_options	116	@notification_options = @user.valid_notification_options
117	@notification_option = @user.mail_notification	117	@notification_option = @user.mail_notification
118		118
119	if request.post?
120	@user.admin = params[:user][:admin] if params[:user][:admin]
121	@user.login = params[:user][:login] if params[:user][:login]
122	if params[:password].present? && (@user.auth_source_id.nil? \|\| params[:user][:auth_source_id].blank?)
123	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
124	end
125	@user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
126	@user.attributes = params[:user]
127	# Was the account actived ? (do it before User#save clears the change)
128	was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
129	# TODO: Similar to My#account
130	@user.mail_notification = params[:notification_option] \|\| 'only_my_events'
131	@user.pref.attributes = params[:pref]
132	@user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
133
134	if @user.save
135	@user.pref.save
136	@user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
137
138	if was_activated
139	Mailer.deliver_account_activated(@user)
140	elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
141	Mailer.deliver_account_information(@user, params[:password])
142	end
143	flash[:notice] = l(:notice_successful_update)
144	redirect_to :back
145	end
146	end
147	@auth_sources = AuthSource.find(:all)	119	@auth_sources = AuthSource.find(:all)
148	@membership \|\|= Member.new	120	@membership \|\|= Member.new
		121	end
		122
		123	verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
		124	def update
		125	@user = User.find(params[:id])
		126	@notification_options = @user.valid_notification_options
		127	@notification_option = @user.mail_notification
		128
		129	@user.admin = params[:user][:admin] if params[:user][:admin]
		130	@user.login = params[:user][:login] if params[:user][:login]
		131	if params[:password].present? && (@user.auth_source_id.nil? \|\| params[:user][:auth_source_id].blank?)
		132	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
		133	end
		134	@user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
		135	@user.attributes = params[:user]
		136	# Was the account actived ? (do it before User#save clears the change)
		137	was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
		138	# TODO: Similar to My#account
		139	@user.mail_notification = params[:notification_option] \|\| 'only_my_events'
		140	@user.pref.attributes = params[:pref]
		141	@user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
		142
		143	if @user.save
		144	@user.pref.save
		145	@user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
		146
		147	if was_activated
		148	Mailer.deliver_account_activated(@user)
		149	elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
		150	Mailer.deliver_account_information(@user, params[:password])
		151	end
		152	flash[:notice] = l(:notice_successful_update)
		153	redirect_to :back
		154	else
		155	@auth_sources = AuthSource.find(:all)
		156	@membership \|\|= Member.new
		157
		158	render :action => :edit
		159	end
149	rescue ::ActionController::RedirectBackError	160	rescue ::ActionController::RedirectBackError
150	redirect_to :controller => 'users', :action => 'edit', :id => @user	161	redirect_to :controller => 'users', :action => 'edit', :id => @user
151	end	162	end
152		163
153	def edit_membership	164	def edit_membership
154	@user = User.find(params[:id])	165	@user = User.find(params[:id])
155	@membership = Member.edit_membership(params[:membership_id], params[:membership], @user)	166	@membership = Member.edit_membership(params[:membership_id], params[:membership], @user)

app/helpers/users_helper.rb +4 -4

               end
               def change_status_link(user)
-                url = {:controller => 'users', :action => 'edit', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
+                url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil}
                 if user.locked?
-                  link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+                  link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
                 elsif user.registered?
-                  link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+                  link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock'
                 elsif user != User.current
-                  link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
+                  link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock'
                 end
               end

app/views/users/_general.rhtml +1 -1

-            <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "edit", :tab => nil }, :html => { :class => nil } do |f| %>
+            <% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %>
             	<%= render :partial => 'form', :locals => { :f => f } %>
             	<% if @user.active? -%>
             		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label>

app/views/users/_groups.rhtml +1 -1

-            <% form_for(:user, :url => { :action => 'edit' }) do %>
+            <% form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
             <div class="box">
             <% Group.all.sort.each do |group| %>
             <label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br />

config/routes.rb +1 -1

                 end
                 users.with_options :conditions => {:method => :post} do |user_actions|
                   user_actions.connect 'users/new', :action => 'create'
-                  user_actions.connect 'users/:id/edit', :action => 'edit'
                   user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
                 end
+                users.connect 'users/:id/edit', :action => 'update', :conditions => {:method => :put}
               end
               # For nice "roadmap" in the url for the index action

test/functional/users_controller_test.rb +8 -8

               end
-              def test_edit
+              def test_update
                 ActionMailer::Base.deliveries.clear
-                post :edit, :id => 2, :user => {:firstname => 'Changed'}, :notification_option => 'all', :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
+                put :update, :id => 2, :user => {:firstname => 'Changed'}, :notification_option => 'all', :pref => {:hide_mail => '1', :comments_sorting => 'desc'}
                 user = User.find(2)
                 assert_equal 'Changed', user.firstname
                 assert ActionMailer::Base.deliveries.empty?
               end
-              def test_edit_with_activation_should_send_a_notification
+              def test_update_with_activation_should_send_a_notification
                 u = User.new(:firstname => 'Foo', :lastname => 'Bar', :mail => 'foo.bar@somenet.foo', :language => 'fr')
                 u.login = 'foo'
                 u.status = User::STATUS_REGISTERED
                 ActionMailer::Base.deliveries.clear
                 Setting.bcc_recipients = '1'
-                post :edit, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
+                put :update, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
                 assert u.reload.active?
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert mail.body.include?(ll('fr', :notice_account_activated))
               end
-              def test_edit_with_password_change_should_send_a_notification
+              def test_updat_with_password_change_should_send_a_notification
                 ActionMailer::Base.deliveries.clear
                 Setting.bcc_recipients = '1'
                 u = User.find(2)
-                post :edit, :id => u.id, :user => {}, :password => 'newpass', :password_confirmation => 'newpass', :send_information => '1'
+                put :update, :id => u.id, :user => {}, :password => 'newpass', :password_confirmation => 'newpass', :send_information => '1'
                 assert_equal User.hash_password('newpass'), u.reload.hashed_password
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?('newpass')
               end
-              test "POST :edit with a password change to an AuthSource user switching to Internal authentication" do
+              test "put :update with a password change to an AuthSource user switching to Internal authentication" do
                 # Configure as auth source
                 u = User.find(2)
                 u.auth_source = AuthSource.find(1)
                 u.save!
-                post :edit, :id => u.id, :user => {:auth_source_id => ''}, :password => 'newpass', :password_confirmation => 'newpass'
+                put :update, :id => u.id, :user => {:auth_source_id => ''}, :password => 'newpass', :password_confirmation => 'newpass'
                 assert_equal nil, u.reload.auth_source
                 assert_equal User.hash_password('newpass'), u.reload.hashed_password

test/integration/admin_test.rb +1 -1

                 assert_kind_of User, logged_user
                 assert_equal "Paul", logged_user.firstname
-                post "users/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
+                put "users/#{user.id}/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
                 assert_redirected_to "/users/#{ user.id }/edit"
                 locked_user = User.try_to_login("psmith", "psmith09")
                 assert_equal nil, locked_user

test/integration/routing_test.rb +2 -1

                 should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
                 should_route :post, "/users/new", :controller => 'users', :action => 'create'
-                should_route :post, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
                 should_route :post, "/users/123/memberships", :controller => 'users', :action => 'edit_membership', :id => '123'
                 should_route :post, "/users/123/memberships/55", :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'
                 should_route :post, "/users/567/memberships/12/destroy", :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
+                should_route :put, "/users/444/edit", :controller => 'users', :action => 'update', :id => '444'
               end
               # TODO: should they all be scoped under /projects/:project_id ?

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