Merge branch 'master' into 13773-will-fail-container-status

[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 6c0264edfdbc8d5ac98375da13529335b52a9e7e..aa78feb9a06f821e1390ab7fbea062d22b497410 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,30 +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_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
+    render_index
   end
 
   def show
-    @objects = @object.contents include_linked: true
-    super
-  end
-
-  def create
-    # params[:group_class]=='folder' if we were routed through /folders
-    logger.error params.inspect
-    if (rsc = params[:group_class])
-      params['group'] = (params[rsc] || {}).merge(group_class: rsc)
+    if @object.group_class == 'project'
+      redirect_to(project_path(@object))
+    else
+      super
     end
-    super
   end
 end