From 952f5d2cc342f8b23d5342d91a7e923b7de525c1 Mon Sep 17 00:00:00 2001 From: younes Date: Mon, 30 Jun 2025 08:22:23 +0100 Subject: [PATCH] fix next url --- .../controllers/rest_api_v2/leave.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py index 34c70de2c..5f5fb5835 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py @@ -151,11 +151,21 @@ class LeaveController(http.Controller): for hol in holidays: value = self.get_return_data(hol, approvel) leaves.append(value) + + params = [] + if approvel: + params.append("approvel=%s" % approvel) + if done: + params.append("done=%s" % done) + + next = validator.get_page_pagination_next(page, count) - url = "/rest_api/v2/leaves?approvel=%s&page=%s" % ( - approvel, next) if next else False - prev_url = "/rest_api/v2/leaves?approvel=%s&page=%s" % ( - approvel, prev) if prev else False + # url = "/rest_api/v2/leaves?approvel=%s&page=%s" % ( + # approvel, next) if next else False + # prev_url = "/rest_api/v2/leaves?approvel=%s&page=%s" % ( + # approvel, prev) if prev else False + url = f"/rest_api/v2/leaves?page={next}&{'&'.join(params)}" if next else False + prev_url = f"/rest_api/v2/leaves?page={prev}&{'&'.join(params)}" if prev else False data = {'links': {'prev': prev_url, 'next': url, },