X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1eee45ce0bbae9e7d04a9382469d2c48fb0cfd3e..08123387faf00b0af64ea01f7196d8c5ca3fae1e:/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 871c901946..87a5699f49 100644
--- a/services/api/app/mailers/admin_notifier.rb
+++ b/services/api/app/mailers/admin_notifier.rb
@@ -1,4 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class AdminNotifier < ActionMailer::Base
+  include AbstractController::Callbacks
+
   default from: Rails.configuration.admin_notifier_email_from
 
   def new_user(user)
@@ -6,8 +12,14 @@ class AdminNotifier < ActionMailer::Base
     if not Rails.configuration.new_user_notification_recipients.empty? then
       @recipients = Rails.configuration.new_user_notification_recipients
       logger.info "Sending mail to #{@recipients} about new user #{@user.uuid} (#{@user.full_name} <#{@user.email}>)"
+
+      add_to_subject = ''
+      if Rails.configuration.auto_setup_new_users
+        add_to_subject = @user.is_invited ? ' and setup' : ', but not setup'
+      end
+
       mail(to: @recipients,
-           subject: "#{Rails.configuration.email_subject_prefix}New user notification"
+           subject: "#{Rails.configuration.email_subject_prefix}New user created#{add_to_subject} notification"
           )
     end
   end