projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20300: Mark belongs_to relations as optional.
[arvados.git]
/
services
/
api
/
app
/
mailers
/
admin_notifier.rb
diff --git
a/services/api/app/mailers/admin_notifier.rb
b/services/api/app/mailers/admin_notifier.rb
index 871c9019467061bf4a6383ffe491a1ddd4ea8c18..2c39a3924e7a65b3c3b105abff3e01224f25ac5a 100644
(file)
--- a/
services/api/app/mailers/admin_notifier.rb
+++ b/
services/api/app/mailers/admin_notifier.rb
@@
-1,24
+1,36
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class AdminNotifier < ActionMailer::Base
class AdminNotifier < ActionMailer::Base
- default from: Rails.configuration.admin_notifier_email_from
+ include AbstractController::Callbacks
+
+ default from: Rails.configuration.Users.AdminNotifierEmailFrom
def new_user(user)
@user = user
def new_user(user)
@user = user
- if not Rails.configuration.
new_user_notification_r
ecipients.empty? then
- @recipients = Rails.configuration.
new_user_notification_recipient
s
+ if not Rails.configuration.
Users.NewUserNotificationR
ecipients.empty? then
+ @recipients = Rails.configuration.
Users.NewUserNotificationRecipients.key
s
logger.info "Sending mail to #{@recipients} about new user #{@user.uuid} (#{@user.full_name} <#{@user.email}>)"
logger.info "Sending mail to #{@recipients} about new user #{@user.uuid} (#{@user.full_name} <#{@user.email}>)"
+
+ add_to_subject = ''
+ if Rails.configuration.Users.AutoSetupNewUsers
+ add_to_subject = @user.is_invited ? ' and setup' : ', but not setup'
+ end
+
mail(to: @recipients,
mail(to: @recipients,
- subject: "#{Rails.configuration.
email_subject_prefix}New user
notification"
+ subject: "#{Rails.configuration.
Users.EmailSubjectPrefix}New user created#{add_to_subject}
notification"
)
end
end
def new_inactive_user(user)
@user = user
)
end
end
def new_inactive_user(user)
@user = user
- if not Rails.configuration.
new_inactive_user_notification_r
ecipients.empty? then
- @recipients = Rails.configuration.
new_inactive_user_notification_recipient
s
+ if not Rails.configuration.
Users.NewInactiveUserNotificationR
ecipients.empty? then
+ @recipients = Rails.configuration.
Users.NewInactiveUserNotificationRecipients.key
s
logger.info "Sending mail to #{@recipients} about new user #{@user.uuid} (#{@user.full_name} <#{@user.email}>)"
mail(to: @recipients,
logger.info "Sending mail to #{@recipients} about new user #{@user.uuid} (#{@user.full_name} <#{@user.email}>)"
mail(to: @recipients,
- subject: "#{Rails.configuration.
email_subject_p
refix}New inactive user notification"
+ subject: "#{Rails.configuration.
Users.EmailSubjectP
refix}New inactive user notification"
)
end
end
)
end
end