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/views/users/_edit.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views/users/_edit.html.haml') diff --git a/app/views/users/_edit.html.haml b/app/views/users/_edit.html.haml index 1d2b68a..8662979 100644 --- a/app/views/users/_edit.html.haml +++ b/app/views/users/_edit.html.haml @@ -2,12 +2,13 @@ -# edit user form, used by both show and edit actions. -# -# We render a bunch of forms here. Which we use depends upon config settings --# user_actions and admin_actions. They both include an array of actions +-# user_actions and admin_actions. They both include an array of actions -# allowed to users and admins. -# Possible forms are: -# 'change_password' -# 'change_pgp_key' -# 'change_service_level' +-# 'contact_email' -# 'destroy_account' - actions = APP_CONFIG[admin? ? :admin_actions : :user_actions] || [] - actions.each do |action| -- cgit v1.2.3