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 bb652d43204cf3f1d3b411db88a0838704970c1c..95a7ee100dacf5f495d2ac4c12d86ac795ad99fd 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,9 @@
    uuid_map = {}
    if @share_links
      [User, Group].each do |type|
-       type.filter([['uuid','in',@share_links.collect(&:tail_uuid)]]).each do |o|
+       type.limit(10000)
+         .filter([['uuid','in',@share_links.collect(&:tail_uuid)]])
+         .each do |o|
          uuid_map[o.uuid] = o
        end
      end
@@ -18,7 +20,7 @@
    end
    perms_json = perms_json.to_json
    choose_filters = {
-     "groups" => [["group_class", "=", nil]],
+     "groups" => [["group_class", "=", "role"]],
    }
    choose_filters.default = []
    owner_icon = fa_icon_class_for_uuid(@object.owner_uuid)
@@ -59,6 +61,7 @@
 <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>
 
@@ -70,12 +73,19 @@
          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>
+    <td>
+      <%= email %>
+    </td>
     <td><%= link_to perm_name_desc_map[link.name], '#', {
       "data-emptytext" => "Read",
       "data-placement" => "bottom",