From 2b749fb1c56e1984a175978197353f98296eba44 Mon Sep 17 00:00:00 2001 From: Stella Date: Sat, 1 Nov 2014 00:19:36 +0200 Subject: [PATCH 1/3] Add clarification when updating user's email --- app/controllers/admin/users_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index d5a52787..57f898ce 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -20,8 +20,15 @@ module Admin end def update + message = '' + if params[:user] && !params[:user][:email].nil? + if (new_email = params[:user][:email]) != @user.email + message = " Confirmation email sent to #{new_email}. The new email needs to be confirmed before it can be used." + end + end + if @user.update_attributes(params[:user]) - redirect_to admin_users_path, notice: "Updated #{@user.name} (#{@user.email})!" + redirect_to admin_users_path, notice: "Updated #{@user.name} (#{@user.email})!" + message else redirect_to admin_users_path, alert: "Could not update #{@user.name} (#{@user.email}). #{@user.errors.full_messages.join('. ')}." end From aa0005ef6e3a2f48ebf536e1954c0e0bc53b1bd3 Mon Sep 17 00:00:00 2001 From: Stella Date: Sat, 1 Nov 2014 00:22:13 +0200 Subject: [PATCH 2/3] not using real emails/domains in tests --- spec/controllers/admin/users_controller_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 97d11d81..ee1d0410 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -7,8 +7,8 @@ describe Admin::UsersController do end describe 'GET #index' do it 'populates an array of users' do - user1 = create(:user, email: 'gopesh.7500@gmail.com') - user2 = create(:user, email: 'gopesh_750@gmail.com') + user1 = create(:user, email: 'user1@email.osem') + user2 = create(:user, email: 'user2@email.osem') get :index expect(assigns(:users)).to match_array([user, admin, user1, user2]) end @@ -26,8 +26,8 @@ describe Admin::UsersController do it 'changes @users attributes' do patch :update, id: user.id expect(build( - :user, email: 'example@incoherent.de', id: user.id).email). - to eq('example@incoherent.de') + :user, email: 'new@email.osem', id: user.id).email). + to eq('new@email.osem') end it 'redirects to the updated user' do patch :update, id: user.id From ce7829e9c111b053e7ce6eae59ca50bd0fc89003 Mon Sep 17 00:00:00 2001 From: Stella Date: Sun, 9 Nov 2014 14:30:22 +0200 Subject: [PATCH 3/3] Profile --- app/views/layouts/_user_menu.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml index c1ae6cea..5688ac80 100644 --- a/app/views/layouts/_user_menu.html.haml +++ b/app/views/layouts/_user_menu.html.haml @@ -6,7 +6,7 @@ %li = link_to(edit_user_path(current_user.id)) do %span.fa.fa-user - Edit Profil + Edit Profile -if @conference and @conference.id %li = link_to(conference_proposal_index_path(@conference.short_title)) do