Merge branch '3414-keep-pull-handler'

[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 ad23065876cfea66acc6caa31eb05b46770ab92b..cafaf6dae78ad539992cb50516fda73cefae219a 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 = {}
-   [@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 = {}
@@ -14,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)