11071: test count=none in groups#contents method.

[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 1b74af75abc97e87a5fc68d6f566ffd08aa0caf0..7d4bca53357d2387f0a3ad144467226f82eb98f1 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -93,19 +93,19 @@ class Arvados::V1::GroupsController < ApplicationController
 
     seen_last_class = false
     klasses.each do |klass|
-      @offset = 0 if seen_last_class  # reset offset for the new type being processed
+      @offset = 0 if seen_last_class  # reset offset for the new next type being processed
 
       # if current klass is same as params['last_object_class'], mark that fact
-      seen_last_class = true if params['count'] == 'none' and (params['last_object_class'].empty? or params['last_object_class'] == klass.to_s)
+      seen_last_class = true if(params['count'].andand.==('none') and (params['last_object_class'].nil? or params['last_object_class'].empty? or params['last_object_class'] == klass.to_s))
 
-      # if a klasses are specified, skip all other klass types
+      # if klasses are specified, skip all other klass types
       next if wanted_klasses.any? and !wanted_klasses.include?(klass.to_s)
 
       # don't reprocess klass types that were already seen
       next if params['count'] == 'none' and !seen_last_class
 
       # don't process rest of object types if we already have needed number of objects
-      break ifparams['count'] == 'none' and @objects.size == @limit
+      break if params['count'] == 'none' and all_objects.size >= limit_all
 
       # If the currently requested orders specifically match the
       # table_name for the current klass, apply that order.