X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2943d9c3622e2c5bca081dc48fd5d8d148dac386..ffb6a2fbc2552b38dd27b216c9db6539e81cef56:/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 358cb2c868..6abd2ff11d 100644
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,21 +1,21 @@
-class GroupsController < ApplicationController
-  def model_class_for_display
-    params[:group_class] || super
-  end
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
+class GroupsController < ApplicationController
   def index
-    if params[:group_class]
-      @groups = Group.where(group_class: params[:group_class])
-    else
-      @groups = Group.all
-    end
+    @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
-    @objects = @object.owned_items include_linked: true
-    super
+    if @object.group_class == 'project' or @object.group_class == 'filter'
+      redirect_to(project_path(@object))
+    else
+      super
+    end
   end
 end