X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7fb83a3380e62721801a4980c48ba78208c7b2e2..75967562d779337c0920841a0a66d130b4ba51a9:/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 854496a56a..6abd2ff11d 100644
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,13 +1,21 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class GroupsController < ApplicationController
   def index
-    @groups = Group.filter [['group_class', 'not in', ['folder']]]
+    @groups = Group.filter [['group_class', '!=', 'project'], ['group_class', '!=', 'filter']]
     @group_uuids = @groups.collect &:uuid
-    @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
-    return redirect_to(folder_path(@object)) if @object.group_class == 'folder'
-    super
+    if @object.group_class == 'project' or @object.group_class == 'filter'
+      redirect_to(project_path(@object))
+    else
+      super
+    end
   end
 end