Consider script_parameters in determining whether to merge script boxes in

[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..7698fdba934cb68e641ea23d7ffe92635aa09ffd 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,30 +1,17 @@
 class GroupsController < ApplicationController
-  def model_class_for_display
-    params[:group_class] || super
-  end
-
   def index
-    if params[:group_class]
-      @groups = Group.where(group_class: params[:group_class])
-    else
-      @groups = Group.all
-    end
+    @groups = Group.filter [['group_class', 'not in', ['folder', '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.in?(['project','folder'])
+      redirect_to(project_path(@object))
+    else
+      super
     end
-    super
   end
 end