From 11eccdccc42ec93f22e08846bd45aadae1d62fcd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 Aug 2023 11:09:15 +0200 Subject: [PATCH] Apply offset only if not null --- cornflow-server/cornflow/models/meta_models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cornflow-server/cornflow/models/meta_models.py b/cornflow-server/cornflow/models/meta_models.py index 119cf7b2..f803b042 100644 --- a/cornflow-server/cornflow/models/meta_models.py +++ b/cornflow-server/cornflow/models/meta_models.py @@ -154,7 +154,9 @@ def get_all_objects( """ if "user" in kwargs: kwargs.pop("user") - query = cls.query.filter_by(**kwargs).offset(offset) + query = cls.query.filter_by(**kwargs) + if offset: + query = query.offset(offset) if limit: query = query.limit(limit) return query @@ -300,7 +302,8 @@ def get_all_objects( if creation_date_lte: query = query.filter(cls.created_at <= creation_date_lte) - query = query.offset(offset) + if offset: + query = query.offset(offset) if limit: query = query.limit(limit) return query