Skip to content
Snippets Groups Projects

fix: alternate email dialogue

Merged azul requested to merge fix/8796-alternate-email into master
3 files
+ 34
2
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -31,6 +31,12 @@ class UsersController < ApplicationController
@@ -31,6 +31,12 @@ class UsersController < ApplicationController
def edit
def edit
end
end
 
def update
 
@user.update_attributes user_params
 
flash[:notice] = I18n.t(:changes_saved) if @user.valid?
 
respond_with @user, location: edit_user_path(@user)
 
end
 
def deactivate
def deactivate
@user.account.disable
@user.account.disable
flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username)
flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username)
@@ -62,7 +68,7 @@ class UsersController < ApplicationController
@@ -62,7 +68,7 @@ class UsersController < ApplicationController
if admin?
if admin?
params.require(:user).permit(:effective_service_level)
params.require(:user).permit(:effective_service_level)
else
else
params.require(:user).permit(:password, :password_confirmation)
params.require(:user).permit(:contact_email)
end
end
end
end
Loading