Fix 2.4.2 upgrade notes formatting refs #19330

[arvados.git] / apps / workbench / app / controllers / groups_controller.rb

diff --git a/apps/workbench/app/controllers/groups_controller.rb b/apps/workbench/app/controllers/groups_controller.rb
index daf8ab94ed60408517b45fbc2d20c3174baa292e..6abd2ff11d1b6a655be0dacd6e10a1dc398a9ddb 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,33 +1,21 @@
-class GroupsController < ApplicationController
-  before_filter :ensure_current_user_is_admin
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
+class GroupsController < ApplicationController
   def index
-    @groups = Group.limit(10000).all
+    @groups = Group.filter [['group_class', '!=', 'project'], ['group_class', '!=', 'filter']]
     @group_uuids = @groups.collect &:uuid
-    @owned_users = User.where owner_uuid: @group_uuids
-    @links_from = Link.where link_class: 'permission', tail_uuid: @group_uuids
-    @links_to = Link.where link_class: 'permission', head_uuid: @group_uuids
+    @links_from = Link.where(link_class: 'permission', tail_uuid: @group_uuids).with_count("none")
+    @links_to = Link.where(link_class: 'permission', head_uuid: @group_uuids).with_count("none")
+    render_index
   end
 
   def show
-    @collections = Collection.where(owner_uuid: @object.uuid)
-    @names = {}
-    @keep_flag = {}
-    @pgp_hu_id = {}
-    Link.
-      limit(10000).
-      where(head_uuid: @collections.collect(&:uuid)).
-      each do |link|
-      if link.properties[:name]
-        @names[link.head_uuid] ||= []
-        @names[link.head_uuid] << link.properties[:name]
-      end
-      if link.link_class == 'resources' and link.name == 'wants'
-        @keep_flag[link.head_uuid] = true
-      end
-      @pgp_hu_id[link.head_uuid] ||= link.properties[:pgp_hu_id]
+    if @object.group_class == 'project' or @object.group_class == 'filter'
+      redirect_to(project_path(@object))
+    else
+      super
     end
-    @collections_total_bytes = @collections.collect(&:total_bytes).inject(0,&:+)
-    super
   end
 end