13996: More config updates

[arvados.git] / services / api / app / views / admin_notifier / new_user.text.erb

diff --git a/services/api/app/views/admin_notifier/new_user.text.erb b/services/api/app/views/admin_notifier/new_user.text.erb
index 9fc8f11caa030556c83b1e6a48d38f4b1542afb9..20a36afcbf2c8a30e7b2a5f951e09f15fd10eb05 100644 (file)
--- a/services/api/app/views/admin_notifier/new_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_user.text.erb
@@ -1,15 +1,24 @@
-A new user has been created<%=' and setup' if Rails.configuration.auto_setup_new_users %>:
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<%
+  add_to_message = ''
+  if Rails.configuration.Users["AutoSetupNewUsers"]
+    add_to_message = @user.is_invited ? ' and setup' : ', but not setup'
+  end
+%>
+A new user has been created<%=add_to_message%>:
 
   <%= @user.full_name %> <<%= @user.email %>>
 
 This user is <%= @user.is_active ? '' : 'NOT ' %>active.
 
-<% if not @wb_address.empty? -%>
+<% if Rails.configuration.workbench_address -%>
 Please see workbench for more information:
 
-  <%= @wb_address %>
+  <%= Rails.configuration.workbench_address %>
 
 <% end -%>
 Thanks,
 Your friendly Arvados robot.
-