9187: If a container is reported Queued, but we are monitoring it, stop monitoring it.

[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..88ecbe35460ceb384527f906929cd9f626f13ecf 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,13 +1,19 @@
-A new user has been created<%=' and setup' if Rails.configuration.auto_setup_new_users %>:
+<%
+  add_to_message = ''
+  if Rails.configuration.auto_setup_new_users
+    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,