projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3296-user-profile
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
groups_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/groups_controller.rb
b/services/api/app/controllers/arvados/v1/groups_controller.rb
index e7d5530088c9e19a905d074e4d05122a083fa7fa..17be40a57ee449a6a0902409ed1aa9ae7853be8a 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-13,9
+13,20
@@
class Arvados::V1::GroupsController < ApplicationController
end
def render_404_if_no_object
end
def render_404_if_no_object
- if params[:action] == 'contents' and !params[:uuid]
- # OK!
- @object = nil
+ if params[:action] == 'contents'
+ if !params[:uuid]
+ # OK!
+ @object = nil
+ true
+ elsif @object
+ # Project group
+ true
+ elsif (@object = User.where(uuid: params[:uuid]).first)
+ # "Home" pseudo-project
+ true
+ else
+ super
+ end
else
super
end
else
super
end
@@
-64,7
+75,7
@@
class Arvados::V1::GroupsController < ApplicationController
Human, Specimen, Trait].each do |klass|
@objects = klass.readable_by(*@read_users)
if klass == Group
Human, Specimen, Trait].each do |klass|
@objects = klass.readable_by(*@read_users)
if klass == Group
- @objects = @objects.where(
'group_class in (?)', ['project', 'folder']
)
+ @objects = @objects.where(
group_class: 'project'
)
end
if opts[:owner_uuid]
conds = []
end
if opts[:owner_uuid]
conds = []