Merge branch 'master' into 3296-user-profile

[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 b360b19aae0b93b0dbb5d3c325fb9c21458d4c6e..080386ea5c6bf6185bcd57e744014203e4060be8 100644 (file)
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,8 +1,17 @@
 class GroupsController < ApplicationController
   def index
-    @groups = Group.all
+    @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
+    if @object.group_class == 'project'
+      redirect_to(project_path(@object))
+    else
+      super
+    end
   end
 end