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 c1d414e47f1c0694f0cc55055549e87da1c6f16b..9fca207dd2140c858a87708d4879ed12fa096919 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-94,7
+94,7
@@
class Arvados::V1::GroupsController < ApplicationController
@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)