projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7478-anm-spot-instances
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
users
/
_show_admin.html.erb
diff --git
a/apps/workbench/app/views/users/_show_admin.html.erb
b/apps/workbench/app/views/users/_show_admin.html.erb
index 262dfa06876cf72cccab68317cd92d8779c340a7..89156aaf820238c3394d5e7d2c7975d03f9009f8 100644
(file)
--- a/
apps/workbench/app/views/users/_show_admin.html.erb
+++ b/
apps/workbench/app/views/users/_show_admin.html.erb
@@
-1,3
+1,7
@@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
<div class="row">
<div class="col-md-6">
<p>
<div class="row">
<div class="col-md-6">
<p>
@@
-11,14
+15,12
@@
</blockquote>
<p>
</blockquote>
<p>
- As an admin, you can setup this user. Please input a VM and
- repository for the user. If you had previously provided any of
- these items, they are pre-filled for you and you can leave them
- as is if you would like to reuse them.
+ As an admin, you can setup a shell account for this user.
+ The login name is automatically generated from the user's e-mail address.
</p>
<blockquote>
</p>
<blockquote>
- <%= link_to "Setup #{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#user-setup-modal-window'} %>
+ <%= link_to "Setup
shell account #{'for ' if @object.full_name.present?}
#{@object.full_name}", setup_popup_user_url(id: @object.uuid), {class: 'btn btn-primary', :remote => true, 'data-toggle' => "modal", 'data-target' => '#user-setup-modal-window'} %>
</blockquote>
<p>
</blockquote>
<p>
@@
-36,6
+38,12
@@
<div class="panel panel-default">
<div class="panel-heading">
Group memberships
<div class="panel panel-default">
<div class="panel-heading">
Group memberships
+
+ <div class="pull-right">
+ <%= link_to raw('<i class="fa fa-plus"></i> Add new group'), "#",
+ {class: 'btn btn-xs btn-primary', 'data-toggle' => "modal",
+ 'data-target' => '#add-group-modal'} %>
+ </div>
</div>
<div class="panel-body">
<div class="alert alert-info">
</div>
<div class="panel-body">
<div class="alert alert-info">
@@
-83,7
+91,7
@@
<small>group→user</small>
</label>
<label class="checkbox-inline">
<small>group→user</small>
</label>
<label class="checkbox-inline">
- <%= group.name || '(unnamed)' %> <span class="deemphasize">(owned by <%= User.find(group.owner_uuid).andand.full_name %>)</span>
+ <%= group.name || '(unnamed)' %> <span class="deemphasize">(owned by <%= User.find
?
(group.owner_uuid).andand.full_name %>)</span>
</label>
</div>
<% end.empty? and begin %>
</label>
</div>
<% end.empty? and begin %>
@@
-94,7
+102,7
@@
</form>
</div>
<div class="panel-footer">
</form>
</div>
<div class="panel-footer">
- T
o manage these groups (roles), us
e:
+ T
hese groups (roles) can also be managed from the command line. For exampl
e:
<ul>
<li><code>arv group create \<br/>--group '{"group_class":"role","name":"New group"}'</code></li>
<li><code>arv group list \<br/>--filters '[["group_class","=","role"]]' \<br/>--select '["uuid","name"]'</code></li>
<ul>
<li><code>arv group create \<br/>--group '{"group_class":"role","name":"New group"}'</code></li>
<li><code>arv group list \<br/>--filters '[["group_class","=","role"]]' \<br/>--select '["uuid","name"]'</code></li>
@@
-106,3
+114,4
@@
</div>
<div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
</div>
<div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+<%= render partial: "add_group_modal" %>