Invario/Inventarsystem
3
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 427 Wiki Activity

Further changes to decypher the user is to the correct username

Browse Source
This commit is contained in:
Aiirondev
2026-11-02 14:36:41 +01:00
parent 9f0d514c38
commit 3afec10346
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/app.py
+21 -9
View File
@@ -164,15 +164,23 @@ def _display_username(user_value):
return ''
raw_value = str(user_value).strip()
user_doc = us.get_user_by_id(raw_value)
if not user_doc:
user_doc = us.get_user_by_student_card(raw_value)
if not user_doc:
user_doc = us.get_user_by_student_card_record_id(raw_value)
if user_doc:
return str(user_doc.get('Username') or user_doc.get('username') or raw_value)
decrypted_value = decrypt_text(raw_value)
lookup_values = [raw_value]
if decrypted_value and decrypted_value not in lookup_values:
lookup_values.append(str(decrypted_value).strip())
return decrypt_text(raw_value)
for lookup_value in lookup_values:
user_doc = us.get_user_by_id(lookup_value)
if not user_doc:
user_doc = us.get_user_by_student_card(lookup_value)
if not user_doc:
user_doc = us.get_user_by_student_card_record_id(lookup_value)
if not user_doc:
user_doc = us.get_user(lookup_value)
if user_doc:
return str(user_doc.get('Username') or user_doc.get('username') or lookup_value)
return str(decrypted_value or raw_value)
def _resolve_library_card_id(user_value):
@@ -186,7 +194,11 @@ def _resolve_library_card_id(user_value):
return str(user_doc.get('StudentCardId') or raw_value).strip().upper()
decrypted_value = decrypt_text(raw_value)
user_doc = us.get_user_by_student_card(decrypted_value)
user_doc = us.get_user_by_id(decrypted_value)
if not user_doc:
user_doc = us.get_user_by_student_card(decrypted_value)
if not user_doc:
user_doc = us.get_user_by_student_card_record_id(decrypted_value)
if user_doc:
return str(user_doc.get('StudentCardId') or decrypted_value).strip().upper()