From 028376fe1ea7638f0119ba9614629f66453d206f Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 13 Nov 2017 13:16:41 +0100 Subject: fix: alternate email dialogue fixes #8796 Cleaned up UserController#update earlier but missed that it was used to change fallback email addresses. Now it is back. This time including an integration test. --- app/controllers/users_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/controllers/users_controller.rb') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index da82d1c..b4c98a0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -31,6 +31,12 @@ class UsersController < ApplicationController def edit 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 @user.account.disable flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username) @@ -62,7 +68,7 @@ class UsersController < ApplicationController if admin? params.require(:user).permit(:effective_service_level) else - params.require(:user).permit(:password, :password_confirmation) + params.require(:user).permit(:contact_email) end end -- cgit v1.2.3