Rakseeibra/arrr-erp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix empty category filter in service catalogue pagination

Browse Source
This commit is contained in:
A R R R Associates
2026-07-19 08:27:18 +05:30
parent a03314af50
commit 73cff705c4
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/services/ui.py
+12 -2
View File
@@ -288,7 +288,17 @@ def category_edit_submit(request: Request, category_id: int, name: str = Form(..
@router.get('/catalogue')
def catalogue_list(request: Request, q: str = '', category_id: int | None = None, recurrence_type: str = '', engagement_type: str = '', page: int = 1, per_page: int = 20):
def catalogue_list(request: Request, q: str = '', category_id: str = '', recurrence_type: str = '', engagement_type: str = '', page: int = 1, per_page: int = 20):
category_id_value: int | None = None
category_id_text = (category_id or '').strip()
if category_id_text:
try:
parsed_category_id = int(category_id_text)
if parsed_category_id > 0:
category_id_value = parsed_category_id
except (TypeError, ValueError):
category_id_value = None
db = CommonSessionLocal()
try:
user = get_current_user(request, db=db)
@@ -296,7 +306,7 @@ def catalogue_list(request: Request, q: str = '', category_id: int | None = None
return RedirectResponse(url='/login', status_code=303)
if not _can_view_services(db, user):
return _redirect_denied()
payload = list_catalogue_payload(db, q=q, category_id=category_id, recurrence_type=recurrence_type, engagement_type=engagement_type, page=page, per_page=per_page)
payload = list_catalogue_payload(db, q=q, category_id=category_id_value, recurrence_type=recurrence_type, engagement_type=engagement_type, page=page, per_page=per_page)
tenant_id = _active_tenant_id(request, user)
can_create_catalogue = _is_system_admin(db, user) and _has_perm(db, user, 'services.create')
can_manage_firm_services = _can_manage_firm_services(db, user)