Changes to habe he template name right and the right correction for the library Item and a parameter mismatch
Release Inventarsystem / release-docker (push) Successful in 2m22s
Release Inventarsystem / release-docker (push) Successful in 2m22s
This commit is contained in:
@@ -30,15 +30,22 @@ import Web.modules.inventarsystem.data_protection as dp
|
||||
def is_library_item(item):
|
||||
"""
|
||||
Determines if an item belongs to the library system.
|
||||
Returns False for 'other', None, or empty ItemType (Inventory item).
|
||||
Returns True for any specific library type ('Buch', 'CD', 'DVD', etc.).
|
||||
Prioritizes explicit 'is_library' boolean field from MongoDB if set.
|
||||
"""
|
||||
if not item:
|
||||
return False
|
||||
|
||||
# 1. Check explicit boolean flag from MongoDB first
|
||||
if 'is_library' in item and item['is_library'] is not None:
|
||||
return bool(item['is_library'])
|
||||
|
||||
# 2. Fallback to ItemType check
|
||||
item_type = item.get('ItemType', 'other')
|
||||
if not item_type:
|
||||
return False
|
||||
return str(item_type).strip().lower() != 'other'
|
||||
|
||||
clean_type = str(item_type).strip().lower()
|
||||
return clean_type not in ['other', 'general', '']
|
||||
|
||||
def safe_decrypt_user(encrypted_user):
|
||||
"""
|
||||
@@ -264,7 +271,10 @@ def get_group_item_ids(id):
|
||||
|
||||
|
||||
def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter2, filter3,
|
||||
ansch_jahr, ansch_kost, code_4, reservierbar, isbn=None, item_type='general'):
|
||||
ansch_jahr, ansch_kost, code_4, reservierbar, isbn="", item_type='other', library_category=""):
|
||||
"""
|
||||
Updates an item in MongoDB, keeping series groups synchronized.
|
||||
"""
|
||||
try:
|
||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||
db = client[cfg.MONGODB_DB]
|
||||
@@ -272,29 +282,35 @@ def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter
|
||||
|
||||
old_item = items.find_one({'_id': ObjectId(id)})
|
||||
if not old_item:
|
||||
client.close()
|
||||
return False
|
||||
|
||||
series_group_id = old_item.get('SeriesGroupId')
|
||||
|
||||
# Recalculate library status based on updated item_type
|
||||
is_lib = is_library_item({'is_library': old_item.get('is_library'), 'ItemType': item_type})
|
||||
|
||||
shared_update = {
|
||||
'Name': name,
|
||||
'Ort': ort,
|
||||
'Beschreibung': beschreibung,
|
||||
'Images': images,
|
||||
'Filter': filter1,
|
||||
'Filter2': filter2,
|
||||
'Filter3': filter3,
|
||||
'Images': images if isinstance(images, list) else [],
|
||||
'Filter': filter1 if isinstance(filter1, list) else [],
|
||||
'Filter2': filter2 if isinstance(filter2, list) else [],
|
||||
'Filter3': filter3 if isinstance(filter3, list) else [],
|
||||
'Anschaffungsjahr': ansch_jahr,
|
||||
'Anschaffungskosten': ansch_kost,
|
||||
'Reservierbar': reservierbar,
|
||||
'ISBN': isbn,
|
||||
'Reservierbar': bool(reservierbar),
|
||||
'ISBN': str(isbn) if isbn else '',
|
||||
'ItemType': item_type,
|
||||
'Verfuegbar': verfuegbar,
|
||||
'is_library': is_lib,
|
||||
'library_category': library_category,
|
||||
'Verfuegbar': bool(verfuegbar),
|
||||
'LastUpdated': datetime.datetime.now()
|
||||
}
|
||||
|
||||
specific_update = shared_update.copy()
|
||||
specific_update['Code_4'] = code_4
|
||||
specific_update['Code_4'] = str(code_4) if code_4 else ''
|
||||
|
||||
items.update_one({'_id': ObjectId(id)}, {'$set': specific_update})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user