projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13146: Clarify documentation for shared endpoint
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index ba7c07d27266f26ef3bcdbcfc01940d406cec9b1..81e4b961e441ab3a7b032ef217c8c65b32eb725e 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-78,6
+78,7
@@
class ApplicationController < ActionController::Base
@distinct = nil
@response_resource_name = nil
@attrs = nil
@distinct = nil
@response_resource_name = nil
@attrs = nil
+ @extra_included = nil
end
def default_url_options
end
def default_url_options
@@
-492,6
+493,9
@@
class ApplicationController < ActionController::Base
:limit => @limit,
:items => @objects.as_api_response(nil, {select: @select})
}
:limit => @limit,
:items => @objects.as_api_response(nil, {select: @select})
}
+ if @extra_included
+ list[:included] = @extra_included.as_api_response(nil, {select: @select})
+ end
case params[:count]
when nil, '', 'exact'
if @objects.respond_to? :except
case params[:count]
when nil, '', 'exact'
if @objects.respond_to? :except