corrected type mismatch

Web/app.py

@@ -6382,10 +6382,6 @@ def is_library_item(item):
 
 @app.route('/item_edit/<id>', methods=['GET', 'POST'])
 def item_edit(id):
-    """
-    Complete endpoint for editing items. Processes Filters 1-3 for ALL items,
-    and applies Library-specific fields when the item is a Library item.
-    """
     if 'username' not in session:
         if request.method == 'POST' and request.is_json:
             return jsonify({'success': False, 'message': 'Nicht angemeldet.'}), 401
@@ -6410,18 +6406,17 @@ def item_edit(id):
         flash('Element in der Datenbank nicht gefunden.', 'error')
         return redirect(url_for('home_admin'))
 
-    # Determine item classification
+    # Bibliothek-Status ermitteln
     library_module_active = cfg.MODULES.is_enabled('library')
     is_lib_item = it.is_library_item(current_item)
     show_library_features = library_module_active and is_lib_item
 
     # -------------------------------------------------------------------
-    # GET METHOD: Render Form
+    # GET METHOD
     # -------------------------------------------------------------------
     if request.method == 'GET':
         current_item['_id'] = str(current_item['_id'])
 
-        # Format individual group codes for the textarea
         base_code = current_item.get('Code_4', '')
         individual_codes = []
         if current_item.get('SeriesGroupId'):
@@ -6445,11 +6440,10 @@ def item_edit(id):
         )
 
     # -------------------------------------------------------------------
-    # POST METHOD: Save Changes
+    # POST METHOD
     # -------------------------------------------------------------------
     redirect_target = request.referrer or url_for('home_admin')
 
-    # Common fields
     name = sanitize_form_value(request.form.get('name'))
     ort = sanitize_form_value(request.form.get('ort'))
     beschreibung = sanitize_form_value(request.form.get('beschreibung'))
@@ -6457,12 +6451,11 @@ def item_edit(id):
     anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
     reservierbar = 'reservierbar' in request.form
 
-    # System Filters 1, 2, and 3 (Processed for ALL items)
+    # Filter 1-3 für alle Objekte
     filter1 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter')), 1)
     filter2 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter2')), 2)
     filter3 = sanitize_form_value(request.form.getlist('filter3'))
 
-    # Barcodes & Group Codes
     code_4 = sanitize_form_value(request.form.get('code_4'))
     individual_codes_raw = request.form.get('individual_codes', '')
 
@@ -6474,7 +6467,6 @@ def item_edit(id):
 
     all_codes_to_check = [code_4] + individual_codes
 
-    # Barcode uniqueness check
     current_group_id = current_item.get('SeriesGroupId')
     client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
     db_instance = client[cfg.MONGODB_DB]
@@ -6497,21 +6489,17 @@ def item_edit(id):
     if has_code_error:
         return redirect(redirect_target)
 
-    # Type-specific processing
     if show_library_features:
-        # --- LIBRARY ITEM SPECIFICS ---
         isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
         item_isbn = normalize_and_validate_isbn(isbn_raw) if isbn_raw else ''
-        item_type = sanitize_form_value(request.form.get('item_type_input', 'Buch'))
+        item_type = sanitize_form_value(request.form.get('item_type_input', current_item.get('ItemType', 'Buch')))
         library_category = sanitize_form_value(request.form.get('library_category', ''))
         images = current_item.get('Images', [])
     else:
-        # --- INVENTORY ITEM SPECIFICS ---
         item_isbn = current_item.get('ISBN', '')
-        item_type = 'other'
+        item_type = current_item.get('ItemType', 'other')
         library_category = current_item.get('library_category', '')
 
-        # Manage images for Inventory Mode
         images_to_keep = request.form.getlist('existing_images')
         original_images = current_item.get('Images', [])
         images = [img for img in original_images if img in images_to_keep]
@@ -6552,14 +6540,11 @@ def item_edit(id):
                     except Exception as e:
                         app.logger.error(f"Image error for item {id}: {e}")
 
-    # Auto-add location to predefined locations list if applicable
     if ort and ort not in it.get_predefined_locations():
         it.add_predefined_location(ort)
 
-    # Sync group barcodes
     it.sync_group_codes(str(id), code_4, individual_codes)
 
-    # Save to MongoDB
     success = it.update_item(
         id=str(id),
         name=name,
@@ -6586,7 +6571,6 @@ def item_edit(id):
 
     return redirect(redirect_target)
 
-
 @app.route('/update_group', methods=['POST'])
 def update_group():
 

Web/modules/database/items.py

@@ -29,16 +29,20 @@ 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.).
+    Ermittelt zuverlässig, ob ein Objekt zur Bibliothek gehört.
+    Gibt True zurück, wenn ItemType ein Medientyp ist (Buch, Schulbuch, CD, DVD etc.)
+    ODER wenn is_library explizit True ist.
     """
     if not item:
         return False
-    item_type = item.get('ItemType', 'other')
-    if not item_type:
-        return False
-    return str(item_type).strip().lower() != 'other'
+
+    # 1. Prüfe zuerst den Medientyp (ItemType)
+    item_type = str(item.get('ItemType', '') or '').strip().lower()
+    if item_type and item_type not in ['other', 'general', 'none', 'null']:
+        return True
+
+    # 2. Falls ItemType 'other' ist, prüfe das is_library Flag
+    return bool(item.get('is_library', False))
 
 def safe_decrypt_user(encrypted_user):
     """
@@ -264,7 +268,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=""):
+    """
+    Aktualisiert ein Objekt in MongoDB und setzt is_library korrekt basierend auf dem Medientyp.
+    """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
         db = client[cfg.MONGODB_DB]
@@ -272,29 +279,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')
 
+        # is_library automatisch anhand des neuen item_type bestimmen
+        is_lib = is_library_item({'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})
 

Web/templates/edit_library.html

@@ -271,7 +271,7 @@
                 <small style="display:block; color:#666; margin-top: 5px;">Der Basis-Code steht oben. Alle weiteren Gruppenmitglieder werden hier untereinander aufgeführt.</small>
             </div>
 
-            <!-- ================= SYSTEM FILTERS 1-3 (ALWAYS AVAILABLE) ================= -->
+            <!-- ================= SYSTEM FILTERS 1-3 (ALWAYS RENDERED) ================= -->
             <div class="filter-inputs">
                 <h3>Unterrichtsfach (Filter 1):</h3>
                 <div class="multi-filter">
@@ -360,7 +360,6 @@
     let code4LastScanned = '';
     let code4LastScannedAt = 0;
 
-    // Load filter dropdown options and select current values
     function loadAndSelectFilterValues(filterNumber) {
         fetch(`/get_predefined_filter_values/${filterNumber}`)
             .then(res => res.json())