2809: Merge branch '2809-workbench-rails4' refs #2809

[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 358cb2c8686c039385782db7e7bbbc1fb3c9f459..854496a56a27c2e73e4a2b6a68cbc8803a440bac 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,21 +1,13 @@
 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']]]
     @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
   end
 
   def show
-    @objects = @object.owned_items include_linked: true
+    return redirect_to(folder_path(@object)) if @object.group_class == 'folder'
     super
   end
 end