This commit is contained in:
+6
-20
@@ -6382,10 +6382,6 @@ def is_library_item(item):
|
||||
|
||||
@app.route('/item_edit/<id>', methods=['GET', 'POST'])
|
||||
def item_edit(id):
|
||||
"""
|
||||
Endpoint for editing items. Correctly determines library vs inventory status
|
||||
and renders Filter 1-3 for ALL item types.
|
||||
"""
|
||||
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'):
|
||||
@@ -6435,7 +6430,6 @@ def item_edit(id):
|
||||
|
||||
current_item['IndividualCodes'] = '\n'.join(individual_codes)
|
||||
|
||||
# FIXED: Changed 'edit_library.html' to 'item_edit.html'
|
||||
return render_template(
|
||||
'edit_library.html',
|
||||
username=session['username'],
|
||||
@@ -6446,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'))
|
||||
@@ -6458,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', '')
|
||||
|
||||
@@ -6475,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]
|
||||
@@ -6498,19 +6489,17 @@ def item_edit(id):
|
||||
if has_code_error:
|
||||
return redirect(redirect_target)
|
||||
|
||||
# Type-specific processing
|
||||
if show_library_features:
|
||||
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:
|
||||
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 Items
|
||||
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]
|
||||
@@ -6551,14 +6540,11 @@ def item_edit(id):
|
||||
except Exception as e:
|
||||
app.logger.error(f"Image error for item {id}: {e}")
|
||||
|
||||
# Auto-add location 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,
|
||||
|
||||
Reference in New Issue
Block a user