From 0a5518d99f7a09a975bb144d9df77d88130b334a Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Mon, 16 Jun 2025 08:05:11 -0500 Subject: [PATCH] Improve filter handling in inventory listing by adding fallback for unknown users, locations, and items --- __pycache__/routes.cpython-313.pyc | Bin 29563 -> 29728 bytes routes.py | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/__pycache__/routes.cpython-313.pyc b/__pycache__/routes.cpython-313.pyc index 71adfaa3dee59b40b8b5feb86cdb25d961c7b09a..ab6dc1377536bd0f140775686d0e61968bab9868 100644 GIT binary patch delta 987 zcmezUjB&vWM!wIyyj%C_jo^U!( zv_4ddA(SPQA(Rnr1{(uIFmEU`A44#oF|$8oFn_cGOl7cu6hp9Juu!mYv@u*v#FP=j z4i?p8(r1hi3Kr923KqBIRAJDRm~5qQZd}C^nwOoIU!JEBTAW%`6w1KBP$d8p^2tw5 zEXmBzLn!hrNzL6{rmw=txMlNfgAhhW&dDDPHF=AUF)%RPVkyec&n>c>T&pTRS<6U( z`#u8$!vqEfhT_|dlkKAvCZ`%rs+W@M@V>z>F~jXLztSCX$>~)StFDWyUldng!*W?% z_qw>rMRAiYA=|?@h96+s7<*aV`MS90MRCu|;@%Tj?irZONSU8ED{qJ1MD81cQZuqH z3u=&NNIH@!7p#0Haz7!}4Mt`&Qm)JCU6Rw=;WvT%fr#XEpNT#T#1_h27SZc;eIRW5 zg^htnY4bkgJ#35*Cs$idQ+&w4z)QbkicRE1y*s4**=6!URZPs09EE5&;S4c delta 790 zcmZ4Rg7Nn=M!wIyyj%6iwT-CLfFAVdQAF^5kkSjdQ8D0 zmYgaKnxc~%^vzj|LKzqsHowwWVPsslncpykk&$h3ijk&HF&hH|g8~>7X)`b|+~Uj0 zEG~)9%qvUHE6FdaEV{?Qz%YSCe`yx%y7HRuXIOFVSd)ktm|@m z7v=QUlw6iGxh`jYQOl}QvGW45ocyb zD0}i*mr|aypn&?!$iUFR@MLm8sPyJcS49@a&y%}7?=imGoaOb4o#`LLP)(aX zgKZflz=naX;|AGN9A8+PT2xu|YVy30F2*05HADZhFse^hkJ`p4xA|UF7Zc;l$(ga; zj4vmDjn!k+*{l-h&&~L9a!IBq V&&&)=QXiO<7}-8}Om-{21psH(0!IJ< diff --git a/routes.py b/routes.py index 436f03b..6c9f979 100644 --- a/routes.py +++ b/routes.py @@ -156,16 +156,22 @@ def list_inventory(): if filter_by and id: column = FILTER_MAP.get(filter_by) if column is not None: + filter_name = None if filter_by == 'user': - filter_name = db.session.query(User).filter(User.id == id).first().full_name + user = db.session.query(User).filter(User.id == id).first() + filter_name = user.full_name if user else "Unknown User" elif filter_by == 'location': - filter_name = db.session.query(Room).filter(Room.id == id).first().full_name + room = db.session.query(Room).filter(Room.id == id).first() + filter_name = room.full_name if room else "Unknown Location" else: - filter_name = db.session.query(Item).filter(Item.id == id).first().description + item = db.session.query(Item).filter(Item.id == id).first() + filter_name = item.description if item else "Unknown Item" + query = query.filter(column == id) else: return "Invalid filter_by parameter", 400 + return render_paginated_table( query=query, page=page,