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

changes to the DIsplayment of the name ussage

Browse Source
This commit is contained in:
Aiirondev
2026-11-01 16:56:01 +01:00
parent 826db109c3
commit 79cf958c3c
2 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/app.py
+33 -26
View File
@@ -158,6 +158,19 @@ def print(*args, **kwargs):
STUDENT_CARD_ENCRYPTED_FIELDS = ('ausweis_ident', 'SchülerName', 'Klasse', 'Notizen')
def _display_username(user_value):
"""Return a username for a stored user ID, with legacy value support."""
if user_value is None or str(user_value).strip() == '':
return ''
raw_value = str(user_value).strip()
user_doc = us.get_user_by_id(raw_value)
if user_doc:
return str(user_doc.get('Username') or user_doc.get('username') or raw_value)
return decrypt_text(raw_value)
def _decrypt_student_card_doc(card_doc):
if not card_doc:
return card_doc
@@ -1212,7 +1225,7 @@ def create_return_reminders():
# Falls der Benutzername verschlüsselt ist, hier entschlüsseln,
# damit der Admin den echten Namen/Ausweis lesen kann.
display_user = decrypt_text(username) if 'decrypt_text' in globals() else username
display_user = _display_username(username)
item_id = str(borrow_doc.get('Item', '')).strip()
item_doc = item_docs.get(item_id, {})
@@ -1383,7 +1396,7 @@ def update_appointment_statuses():
old_status = appointment.get('Status')
activation_user = str(appointment.get('User') or '').strip()
try:
activation_user = decrypt_text(activation_user) if activation_user else ''
activation_user = _display_username(activation_user)
except Exception:
pass
activation_item_name = str(appointment.get('Item') or 'Termin')
@@ -1450,7 +1463,7 @@ def update_appointment_statuses():
holder = ''
if item_doc and item_doc.get('User'):
try:
holder = decrypt_text(str(item_doc['User']))
holder = _display_username(item_doc['User'])
except Exception:
holder = str(item_doc['User'])
if not holder:
@@ -1464,12 +1477,12 @@ def update_appointment_statuses():
)
if active_holder and active_holder.get('User'):
try:
holder = decrypt_text(str(active_holder['User']))
holder = _display_username(active_holder['User'])
except Exception:
holder = str(active_holder['User'])
requested_user = str(appointment.get('User') or '').strip()
try:
requested_user = decrypt_text(requested_user) if requested_user else ''
requested_user = _display_username(requested_user)
except Exception:
pass
item_name = (item_doc or {}).get('Name') or str(item_id)
@@ -1647,7 +1660,7 @@ def update_appointment_statuses():
raw_user = str(appt.get('User', '')).strip()
# Entschlüsselung der AusweisId
decrypted_user = decrypt_text(raw_user) if 'decrypt_text' in globals() else raw_user
decrypted_user = _display_username(raw_user)
target_ausweis_id = decrypted_user if decrypted_user else raw_user
item_id = appt.get('Item')
@@ -4523,7 +4536,7 @@ def api_item_detail(item_id):
try:
item_user = item.get('User')
if item_user is not None:
borrower_value = decrypt_text(str(item_user))
borrower_value = _display_username(item_user)
except Exception:
borrower_value = str(item.get('User', ''))
@@ -8019,10 +8032,7 @@ def get_planned_bookings(item_id):
bookings = []
for r in cursor:
raw_user = r.get('User') or ''
try:
booking_user = decrypt_text(raw_user) if raw_user else ''
except Exception:
booking_user = str(raw_user)
booking_user = _display_username(raw_user)
bookings.append({
'id': str(r.get('_id')),
'user': booking_user,
@@ -8053,10 +8063,7 @@ def get_planned_bookings_public(item_id):
bookings = []
for r in cursor:
raw_user = r.get('User') or ''
try:
booking_user = decrypt_text(raw_user) if raw_user else ''
except Exception:
booking_user = str(raw_user)
booking_user = _display_username(raw_user)
bookings.append({
'user': booking_user,
'period': r.get('Period'),
@@ -8900,7 +8907,7 @@ def user_del():
fullname = None
users_list.append({
'username': decrypt_text(username),
'username': _display_username(username),
'admin': user.get('Admin', False),
'fullname': fullname,
'name': name,
@@ -9041,7 +9048,7 @@ def admin_borrowings():
has_damage = False
raw_user = r.get('User', '')
decrypted_user = decrypt_text(raw_user) if raw_user else ''
decrypted_user = _display_username(raw_user)
entries.append({
@@ -10276,8 +10283,8 @@ def library_item_invoices(item_id):
entries.append({
'borrow_id': str(borrow_doc.get('_id')),
'borrow_status': borrow_doc.get('Status', ''),
'borrow_user': decrypt_text(borrow_doc.get('User', '')) if hasattr(borrow_doc,
'get') and borrow_doc.get(
'borrow_user': _display_username(borrow_doc.get('User', '')) if hasattr(borrow_doc,
'get') and borrow_doc.get(
'User') else '',
'borrow_start': borrow_doc.get('Start').strftime('%d.%m.%Y %H:%M') if isinstance(
borrow_doc.get('Start'), datetime.datetime) else '',
@@ -10377,7 +10384,7 @@ def library_item_invoices(item_id):
))
for b in damage_borrow_docs:
borrow_user = decrypt_text(b.get('User', '')) if b.get('User') else '—'
borrow_user = _display_username(b.get('User', '')) if b.get('User') else '—'
d_data = b.get('DamageData') or {}
if not isinstance(d_data, dict): d_data = {}
@@ -10667,7 +10674,7 @@ def logs():
formatted_items.append({
'Item': item_name,
'User': decrypt_text(username),
'User': _display_username(username),
'Start': start_date,
'End': end_date,
'Duration': duration,
@@ -10709,7 +10716,7 @@ def logs():
note = log_item.get('note', '')
formatted_items.append({
'Item': item_name,
'User': decrypt_text(log_item.get('user', 'Unknown User')),
'User': _display_username(log_item.get('user', 'Unknown User')),
'Start': ts_display,
'End': '-',
'Duration': '-',
@@ -10723,7 +10730,7 @@ def logs():
resolved_count = log_item.get('resolved_count', 0)
formatted_items.append({
'Item': item_name,
'User': decrypt_text(log_item.get('user', 'Unknown User')),
'User': _display_username(log_item.get('user', 'Unknown User')),
'Start': ts_display,
'End': '-',
'Duration': '-',
@@ -11928,10 +11935,10 @@ def admin_damaged_items():
# Benutzernamen der Ausleihe entschlüsseln
if active_borrow and active_borrow.get('User'):
active_borrow['User'] = decrypt_text(active_borrow['User'])
active_borrow['User'] = _display_username(active_borrow['User'])
# Direkt am Item hinterlegten Nutzer entschlüsseln
item_user = decrypt_text(item.get('User')) if item.get('User') else ''
item_user = _display_username(item.get('User')) if item.get('User') else ''
# Datenstruktur exakt für dein Jinja2 Template aufbauen
damaged_items.append({
@@ -12504,7 +12511,7 @@ def cancel_ausleihung_route(id):
ausleihung_status = ausleihung.get('Status', 'unknown')
raw_ausleihung_user = ausleihung.get('User', '')
try:
ausleihung_user = decrypt_text(raw_ausleihung_user) if raw_ausleihung_user else ''
ausleihung_user = _display_username(raw_ausleihung_user)
except Exception:
ausleihung_user = str(raw_ausleihung_user or '')
print(f"Found ausleihung: ID={id}, Status={ausleihung_status}")
Web/modules/database/user.py
+36
View File
@@ -874,6 +874,42 @@ def get_user(username):
client.close()
def get_user_by_id(user_id):
"""Retrieve a user by MongoDB document ID."""
if user_id is None:
return None
lookup_values = [str(user_id)]
if ObjectId.is_valid(str(user_id)):
lookup_values.insert(0, ObjectId(str(user_id)))
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
try:
def find_in_db(database_name):
users = client[database_name]['users']
for lookup_value in lookup_values:
user = users.find_one({'_id': lookup_value})
if user:
return user
return None
tenant_db, tenant_id = _resolve_request_tenant_db()
if tenant_db:
user = find_in_db(tenant_db)
if user:
return user
if _has_tenant_configs() and tenant_db is None:
logger.warning(
"Refusing default DB fallback for user ID lookup because tenant configs exist and no tenant was resolved."
)
return None
return find_in_db(cfg.MONGODB_DB)
finally:
client.close()
def check_admin(username):
"""Check if a user has administrator privileges."""
user = get_user(username)