X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3c12b6126b87af781058b159332446ee458635af..5a3b04f7177afe202ab4f8776b5ca2567b4fdabe:/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 6a2b92d766..9fca207dd2 100644 --- 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 }, + # include_linked returns name links, which are obsolete, so + # remove it when clients have been migrated. include_linked: { type: 'boolean', required: false, default: false }, @@ -34,6 +36,8 @@ class Arvados::V1::GroupsController < ApplicationController def contents # Set @objects: + # 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 (?)' @@ -82,12 +86,6 @@ class Arvados::V1::GroupsController < ApplicationController cond_params = [] conds << "#{klass.table_name}.owner_uuid = ?" cond_params << opts[:owner_uuid] - if opts[:include_linked] - haslink = "#{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'}" - haslink += " AND links.tail_uuid=#{klass.sanitize opts[:owner_uuid]}" - haslink += ")" - conds << haslink - end if conds.any? cond_sql = '(' + conds.join(') OR (') + ')' @objects = @objects.where(cond_sql, *cond_params)