projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git.clinicalfuture.com:arvados into 1685-api-server-redirect...
[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 de0c50c57849fd2ae4e50ab434fc83facdad696a..c6e7da0e11391297513a3cf8016d1ea1196d2148 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-335,6
+335,9
@@
class ApplicationController < ActionController::Base
:next_link => "",
:items => @objects.as_api_response(nil)
}
+ if @objects.respond_to? :except
+ @object_list[:items_available] = @objects.except(:limit).count
+ end
render json: @object_list
end