From 2b4fa96b7402de502777e20661268ae4b13b352a Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 4 Dec 2013 14:38:22 +0800 Subject: [PATCH] No email for user if added by admin --- app/controllers/admin/users_new_interface_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/users_new_interface_controller.rb b/app/controllers/admin/users_new_interface_controller.rb index 0631659a..c5a569dd 100644 --- a/app/controllers/admin/users_new_interface_controller.rb +++ b/app/controllers/admin/users_new_interface_controller.rb @@ -16,6 +16,10 @@ class Admin::UsersNewInterfaceController < OrbitMemberController user = User.find(params[:users_new_interface_id]) user.approved = true user.save + desk = user.desktop + desk.theme = DesktopTheme.first.id.to_s + desk.wallpaper = nil + desk.save! redirect_to admin_users_new_interface_registration_approval_path end @@ -168,10 +172,9 @@ class Admin::UsersNewInterfaceController < OrbitMemberController # } # @user.rebuild_sub_roles_from_attribute_values!(attribute_values) # binding.pry - @user.confirmation_token = nil - @user.confirmed_at = Time.now + @user.skip_confirmation! @user.approved = true - + if !flash.now[:error] && @user.save desk = @user.desktop desk.theme = DesktopTheme.first.id.to_s