projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
16306: Merge branch 'master'
[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 1800e125d27d8e0b89795ed836924762b75ec5d1..e1ae76ed29f7e6d58862f7d1bffd464c63644a93 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-578,7
+578,7
@@
class ApplicationController < ActionController::Base
if @objects.respond_to? :except
list[:items_available] = @objects.
except(:limit).except(:offset).
-
distinct.count(:id
)
+
count(@distinct ? :id : '*'
)
end
when 'none'
else