Merge branch '21666-provision-test-improvement'

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

diff --git a/services/api/app/views/admin_notifier/new_inactive_user.text.erb b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
index 2e9e01d05f1363c17b75f4d037253667e3954e87..22298b1ce7807561d3bacc54b05d8c71167c28aa 100644 (file)
--- a/services/api/app/views/admin_notifier/new_inactive_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
@@ -1,12 +1,17 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
 
-A new user landed on the inactive user page:
+SPDX-License-Identifier: AGPL-3.0 %>
 
-  <%= @user.full_name %> <<%= @user.email %>>
+A new user has been created, but not set up.
 
-<% if not @wb_address.empty? -%>
-Please see workbench for more information:
+  <%= @user.full_name %> <<%= @user.email %>> (<%= @user.username %>)
 
-  <%= @wb_address %>
+They will not be able to use Arvados unless set up by an admin.
+
+<% if Rails.configuration.Services.Workbench1.ExternalURL -%>
+Please see Workbench for more information:
+
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,