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 c706c5205800fe5caf2846646a6b18e08d1940fd..854496a56a27c2e73e4a2b6a68cbc8803a440bac 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,9 +1,13 @@
 class GroupsController < ApplicationController
   def index
-    @groups = Group.limit(10000).all
+    @groups = Group.filter [['group_class', 'not in', ['folder']]]
     @group_uuids = @groups.collect &:uuid
-    @owned_users = User.where owner_uuid: @group_uuids
     @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
+    return redirect_to(folder_path(@object)) if @object.group_class == 'folder'
+    super
+  end
 end