projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
[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 6b214034fa2da20d28f075bb22d4b0b6620f3701..9fca207dd2140c858a87708d4879ed12fa096919 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-6,6
+6,8
@@
class Arvados::V1::GroupsController < ApplicationController
uuid: {
type: 'string', required: false, default: nil
},
uuid: {
type: 'string', required: false, default: nil
},
+ # include_linked returns name links, which are obsolete, so
+ # remove it when clients have been migrated.
include_linked: {
type: 'boolean', required: false, default: false
},
include_linked: {
type: 'boolean', required: false, default: false
},
@@
-13,9
+15,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
@@
-23,8
+36,10
@@
class Arvados::V1::GroupsController < ApplicationController
def contents
# Set @objects:
def contents
# Set @objects:
- load_searchable_objects(owner_uuid: @object.andand.uuid, include_linked: params[:include_linked])
-
+ # include_linked returns name links, which are obsolete, so
+ # remove it when clients have been migrated.
+ load_searchable_objects(owner_uuid: @object.andand.uuid,
+ include_linked: params[:include_linked])
sql = 'link_class=? and head_uuid in (?)'
sql_params = ['name', @objects.collect(&:uuid)]
if @object
sql = 'link_class=? and head_uuid in (?)'
sql_params = ['name', @objects.collect(&:uuid)]
if @object
@@
-64,24
+79,22
@@
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 = ?',
'project')
+ @objects = @objects.where(
group_class:
'project')
end
end
- conds = []
- cond_params = []
if opts[:owner_uuid]
if opts[:owner_uuid]
+ conds = []
+ cond_params = []
conds << "#{klass.table_name}.owner_uuid = ?"
cond_params << opts[:owner_uuid]
conds << "#{klass.table_name}.owner_uuid = ?"
cond_params << opts[:owner_uuid]
+ if conds.any?
+ cond_sql = '(' + conds.join(') OR (') + ')'
+ @objects = @objects.where(cond_sql, *cond_params)
+ end
end
end
- if opts[:include_linked]
- conds << "#{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
- end
- if conds.any?
- cond_sql = '(' + conds.join(') OR (') + ')'
- @objects = @objects.where(cond_sql, *cond_params)
- end
+
@objects = @objects.order("#{klass.table_name}.uuid")
@limit = limit_all - all_objects.count
@objects = @objects.order("#{klass.table_name}.uuid")
@limit = limit_all - all_objects.count
- apply_where_limit_order_params
+ apply_where_limit_order_params
klass
klass_items_available = @objects.
except(:limit).except(:offset).
count(:id, distinct: true)
klass_items_available = @objects.
except(:limit).except(:offset).
count(:id, distinct: true)