projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4054-sharing-email
[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 a5482efc1d3efbd0fb6d36ca48f1873b74730f9b..95a7ee100dacf5f495d2ac4c12d86ac795ad99fd 100644
(file)
--- a/
apps/workbench/app/views/projects/_show_sharing.html.erb
+++ b/
apps/workbench/app/views/projects/_show_sharing.html.erb
@@
-1,7
+1,13
@@
<%
uuid_map = {}
<%
uuid_map = {}
- [@users, @groups].each do |obj_list|
- obj_list.each { |o| uuid_map[o.uuid] = o }
+ if @share_links
+ [User, Group].each do |type|
+ type.limit(10000)
+ .filter([['uuid','in',@share_links.collect(&:tail_uuid)]])
+ .each do |o|
+ uuid_map[o.uuid] = o
+ end
+ end
end
perm_name_desc_map = {}
perm_desc_name_map = {}
end
perm_name_desc_map = {}
perm_desc_name_map = {}
@@
-13,6
+19,10
@@
perms_json << {value: link_name, text: link_desc}
end
perms_json = perms_json.to_json
perms_json << {value: link_name, text: link_desc}
end
perms_json = perms_json.to_json
+ choose_filters = {
+ "groups" => [["group_class", "=", "role"]],
+ }
+ choose_filters.default = []
owner_icon = fa_icon_class_for_uuid(@object.owner_uuid)
if owner_icon == "fa-users"
owner_icon = "fa-folder"
owner_icon = fa_icon_class_for_uuid(@object.owner_uuid)
if owner_icon == "fa-users"
owner_icon = "fa-folder"
@@
-27,9
+37,11
@@
<%= link_to(send("choose_#{share_class}_path",
title: "Share with #{share_class}",
<%= link_to(send("choose_#{share_class}_path",
title: "Share with #{share_class}",
+ by_project: false,
preview_pane: false,
multiple: true,
limit: 10000,
preview_pane: false,
multiple: true,
limit: 10000,
+ filters: choose_filters[share_class].to_json,
action_method: 'post',
action_href: share_with_project_path,
action_name: 'Add',
action_method: 'post',
action_href: share_with_project_path,
action_name: 'Add',
@@
-49,6
+61,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>
@@
-60,12
+73,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",