projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4233-graph-job-stats' closes #4233
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
projects
/
_show_sharing.html.erb
diff --git
a/apps/workbench/app/views/projects/_show_sharing.html.erb
b/apps/workbench/app/views/projects/_show_sharing.html.erb
index cafaf6dae78ad539992cb50516fda73cefae219a..cc862c425c168e5ab61e4a12827bed2df517adbc 100644
(file)
--- a/
apps/workbench/app/views/projects/_show_sharing.html.erb
+++ b/
apps/workbench/app/views/projects/_show_sharing.html.erb
@@
-2,7
+2,7
@@
uuid_map = {}
if @share_links
[User, Group].each do |type|
uuid_map = {}
if @share_links
[User, Group].each do |type|
- type
.limit(10000)
+ type
.filter([['uuid','in',@share_links.collect(&:tail_uuid)]])
.each do |o|
uuid_map[o.uuid] = o
.filter([['uuid','in',@share_links.collect(&:tail_uuid)]])
.each do |o|
uuid_map[o.uuid] = o
@@
-40,7
+40,6
@@
by_project: false,
preview_pane: false,
multiple: true,
by_project: false,
preview_pane: false,
multiple: true,
- limit: 10000,
filters: choose_filters[share_class].to_json,
action_method: 'post',
action_href: share_with_project_path,
filters: choose_filters[share_class].to_json,
action_method: 'post',
action_href: share_with_project_path,
@@
-61,6
+60,7
@@
<table id="project_sharing" class="topalign table" style="clear: both; margin-top: 1em;">
<tr>
<th>User/Group Name</th>
<table id="project_sharing" class="topalign table" style="clear: both; margin-top: 1em;">
<tr>
<th>User/Group Name</th>
+ <th>Email Address</th>
<th colspan="2">Project Access</th>
</tr>
<th colspan="2">Project Access</th>
</tr>
@@
-72,12
+72,19
@@
link_name = shared_with.full_name
else
link_name = shared_with.name
link_name = shared_with.full_name
else
link_name = shared_with.name
- end %>
+ end
+ if shared_with && shared_with.respond_to?(:email)
+ email = shared_with.email
+ end
+ %>
<tr data-object-uuid="<%= link.uuid %>">
<td>
<i class="fa fa-fw <%= fa_icon_class_for_uuid(link.tail_uuid) %>"></i>
<%= link_to_if_arvados_object(link.tail_uuid, link_text: link_name) %>
</td>
<tr data-object-uuid="<%= link.uuid %>">
<td>
<i class="fa fa-fw <%= fa_icon_class_for_uuid(link.tail_uuid) %>"></i>
<%= link_to_if_arvados_object(link.tail_uuid, link_text: link_name) %>
</td>
+ <td>
+ <%= email %>
+ </td>
<td><%= link_to perm_name_desc_map[link.name], '#', {
"data-emptytext" => "Read",
"data-placement" => "bottom",
<td><%= link_to perm_name_desc_map[link.name], '#', {
"data-emptytext" => "Read",
"data-placement" => "bottom",