From 691964695f5e0678e280d9c692881ee47ade8baf Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 17 Sep 2020 15:47:52 +0000 Subject: [PATCH] fix source indent of app/models/user.rb git-svn-id: http://svn.redmine.org/redmine/trunk@20037 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index d905aa1b3..c859994ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -967,16 +967,13 @@ class User < Principal if (admin? && saved_change_to_id? && active?) || # newly created admin (admin? && saved_change_to_admin? && active?) || # regular user became admin (admin? && saved_change_to_status? && active?) # locked admin became active again - - deliver = true - options[:message] = :mail_body_security_notification_add - + deliver = true + options[:message] = :mail_body_security_notification_add elsif (admin? && destroyed? && active?) || # active admin user was deleted (!admin? && saved_change_to_admin? && active?) || # admin is no longer admin (admin? && saved_change_to_status? && !active?) # admin was locked - - deliver = true - options[:message] = :mail_body_security_notification_remove + deliver = true + options[:message] = :mail_body_security_notification_remove end if deliver