projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19129-wb1-dashboard-speedup' refs #19129
[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 7698fdba934cb68e641ea23d7ffe92635aa09ffd..6abd2ff11d1b6a655be0dacd6e10a1dc398a9ddb 100644
(file)
--- a/
apps/workbench/app/controllers/groups_controller.rb
+++ b/
apps/workbench/app/controllers/groups_controller.rb
@@
-1,14
+1,18
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class GroupsController < ApplicationController
def index
class GroupsController < ApplicationController
def index
- @groups = Group.filter [['group_class', '
not in', ['folder', 'project']
]]
+ @groups = Group.filter [['group_class', '
!=', 'project'], ['group_class', '!=', 'filter'
]]
@group_uuids = @groups.collect &:uuid
@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
+ @links_from = Link.where
(link_class: 'permission', tail_uuid: @group_uuids).with_count("none")
+ @links_to = Link.where
(link_class: 'permission', head_uuid: @group_uuids).with_count("none")
render_index
end
def show
render_index
end
def show
- if @object.group_class
.in?(['project','folder'])
+ if @object.group_class
== 'project' or @object.group_class == 'filter'
redirect_to(project_path(@object))
else
super
redirect_to(project_path(@object))
else
super