Enhance booking user decryption and improve item modal styling
Release Inventarsystem / release-docker (push) Successful in 2m25s
Release Inventarsystem / release-docker (push) Successful in 2m25s
This commit is contained in:
+24
-4
@@ -5918,6 +5918,11 @@ def get_bookings():
|
||||
|
||||
result = []
|
||||
for booking in bookings:
|
||||
raw_booking_user = booking.get('User') or ''
|
||||
try:
|
||||
booking_user = decrypt_text(raw_booking_user) if raw_booking_user else ''
|
||||
except Exception:
|
||||
booking_user = str(raw_booking_user)
|
||||
start_dt = booking.get('Start')
|
||||
if not start_dt:
|
||||
continue
|
||||
@@ -5960,10 +5965,10 @@ def get_bookings():
|
||||
'end': end_dt.isoformat() if isinstance(end_dt, datetime.datetime) else str(end_dt),
|
||||
'status': status,
|
||||
'itemId': item_id,
|
||||
'userName': str(booking.get('User') or ''),
|
||||
'userName': str(booking_user),
|
||||
'notes': str(booking.get('Notes') or ''),
|
||||
'period': period,
|
||||
'isCurrentUser': str(booking.get('User') or '') == username,
|
||||
'isCurrentUser': str(booking_user) == username,
|
||||
'itemBorrower': item_borrower,
|
||||
})
|
||||
|
||||
@@ -7911,9 +7916,14 @@ def get_planned_bookings(item_id):
|
||||
cursor = ausleihungen.find({'Item': item_id, 'Status': 'planned'}).sort('Start', 1)
|
||||
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)
|
||||
bookings.append({
|
||||
'id': str(r.get('_id')),
|
||||
'user': r.get('User', ''),
|
||||
'user': booking_user,
|
||||
'period': r.get('Period'),
|
||||
'start': r.get('Start').isoformat() if r.get('Start') else None,
|
||||
'end': r.get('End').isoformat() if r.get('End') else None,
|
||||
@@ -7940,7 +7950,13 @@ def get_planned_bookings_public(item_id):
|
||||
cursor = ausleihungen.find({'Item': item_id, 'Status': 'planned'}).sort('Start', 1)
|
||||
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)
|
||||
bookings.append({
|
||||
'user': booking_user,
|
||||
'period': r.get('Period'),
|
||||
'start': r.get('Start').isoformat() if r.get('Start') else None,
|
||||
'end': r.get('End').isoformat() if r.get('End') else None
|
||||
@@ -12311,7 +12327,11 @@ def cancel_ausleihung_route(id):
|
||||
|
||||
# Log ausleihung details for debugging
|
||||
ausleihung_status = ausleihung.get('Status', 'unknown')
|
||||
ausleihung_user = ausleihung.get('User', 'unknown')
|
||||
raw_ausleihung_user = ausleihung.get('User', '')
|
||||
try:
|
||||
ausleihung_user = decrypt_text(raw_ausleihung_user) if raw_ausleihung_user else ''
|
||||
except Exception:
|
||||
ausleihung_user = str(raw_ausleihung_user or '')
|
||||
print(f"Found ausleihung: ID={id}, Status={ausleihung_status}")
|
||||
|
||||
current_permissions = us.get_effective_permissions(session['username'])
|
||||
|
||||
Reference in New Issue
Block a user