devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3699 from expsa/kch_dev_odex25_mobile 

fix next url
This commit is contained in:
kchyounes19 2025-06-30 08:23:28 +01:00 committed by GitHub
parent 5844edfac2 952f5d2cc3
commit c2cd6c6b32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
View File

@ -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, },