Merge pull request ome#321 from will-moore/getObjects_params_limit_fix

Don't ignore params limit if offset is None
muhanadz · Mar 17, 2022 · 45c9942 · 45c9942
2 parents bf230dd + f9f15de
commit 45c9942
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/omero/gateway/__init__.py b/src/omero/gateway/__init__.py
@@ -3381,12 +3381,14 @@ def buildQuery(self, obj_type, ids=None, params=None, attributes=None,
             # pagination
             ofs = params.theFilter.offset
             lmt = params.theFilter.limit
-            if ofs is not None and lmt is not None:
+            if ofs is not None:
                 offset = ofs.val
+            if lmt is not None:
                 limit = lmt.val
-            # Other params args will be ignored unless we handle here
 
-        if limit is not None and offset is not None:
+        if limit is not None:
+            if offset is None:
+                offset = 0
             baseParams.page(offset, limit)
 
         # getting object by ids