X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1c45ed6a43b01a4f216cf8877b35d9ad18e1c5b5..a7824d56a519db6d729323ca56e653db7e895f3c:/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 358cb2c868..7698fdba93 100644 --- a/apps/workbench/app/controllers/groups_controller.rb +++ b/apps/workbench/app/controllers/groups_controller.rb @@ -1,21 +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.owned_items include_linked: true - super + if @object.group_class.in?(['project','folder']) + redirect_to(project_path(@object)) + else + super + end end end