Changes to the formating and processing of the group codes
Release Inventarsystem / release-docker (push) Successful in 2m15s
Release Inventarsystem / release-docker (push) Successful in 2m15s
This commit is contained in:
+10
-75
@@ -6400,10 +6400,12 @@ def item_edit(id):
|
||||
|
||||
item['_id'] = str(item['_id'])
|
||||
|
||||
# Gruppen-Codes aufteilen in Basis-Code und Einzelcodes für die Textarea
|
||||
# Codes für die Ansicht trennen (Basis-Code vs. Einzelcodes)
|
||||
base_code = item.get('Code_4', '')
|
||||
individual_codes = []
|
||||
if item.get('SeriesGroupId'):
|
||||
|
||||
group_id = item.get('SeriesGroupId')
|
||||
if group_id:
|
||||
group_ids = it.get_group_item_ids(str(item['_id']))
|
||||
if group_ids:
|
||||
for gid in group_ids:
|
||||
@@ -6416,7 +6418,7 @@ def item_edit(id):
|
||||
show_library = cfg.MODULES.is_enabled('library')
|
||||
|
||||
return render_template(
|
||||
'edit_library.html',
|
||||
'item_edit.html',
|
||||
username=session['username'],
|
||||
item=item,
|
||||
library_module_enabled=show_library,
|
||||
@@ -6424,7 +6426,7 @@ def item_edit(id):
|
||||
page_title=f"Bearbeiten: {item.get('Name', '')}"
|
||||
)
|
||||
|
||||
# --- POST: Speichern ---
|
||||
# --- POST: Speichern ---
|
||||
redirect_target = request.referrer or url_for('home_admin')
|
||||
current_item = it.get_item(obj_id)
|
||||
|
||||
@@ -6437,7 +6439,7 @@ def item_edit(id):
|
||||
ort = sanitize_form_value(request.form.get('ort'))
|
||||
beschreibung = sanitize_form_value(request.form.get('beschreibung'))
|
||||
|
||||
# Basis-Code & Einzelcodes
|
||||
# Basis-Code & Einzelcodes aus der Textarea
|
||||
code_4 = sanitize_form_value(request.form.get('code_4'))
|
||||
individual_codes_raw = request.form.get('individual_codes', '')
|
||||
|
||||
@@ -6449,21 +6451,7 @@ def item_edit(id):
|
||||
|
||||
all_codes_to_check = [code_4] + individual_codes
|
||||
|
||||
isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
|
||||
anschaffungs_jahr = sanitize_form_value(request.form.get('anschaffungsjahr'))
|
||||
anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
|
||||
reservierbar = 'reservierbar' in request.form
|
||||
|
||||
item_type_input = sanitize_form_value(request.form.get('item_type_input'))
|
||||
library_category = sanitize_form_value(request.form.get('library_category'))
|
||||
|
||||
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'))
|
||||
|
||||
verfuegbar = current_item.get('Verfuegbar', True)
|
||||
|
||||
# Sicherer Uniqueness-Check für alle Codes über eine lokale DB-Verbindung
|
||||
# Uniqueness-Check über alle Codes
|
||||
current_group_id = current_item.get('SeriesGroupId')
|
||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||
db_instance = client[cfg.MONGODB_DB]
|
||||
@@ -6486,63 +6474,10 @@ def item_edit(id):
|
||||
if has_code_error:
|
||||
return redirect(redirect_target)
|
||||
|
||||
# ISBN validieren
|
||||
item_isbn = ''
|
||||
item_type = item_type_input or current_item.get('ItemType', 'general')
|
||||
if cfg.MODULES.is_enabled('library') and isbn_raw:
|
||||
item_isbn = normalize_and_validate_isbn(isbn_raw)
|
||||
if not item_isbn:
|
||||
flash('Ungültiges ISBN-Format.', 'error')
|
||||
return redirect(redirect_target)
|
||||
|
||||
# Bilder verarbeiten
|
||||
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]
|
||||
|
||||
new_files = request.files.getlist('images')
|
||||
if new_files and new_files[0].filename != '':
|
||||
fs = get_gridfs()
|
||||
for file in new_files:
|
||||
if file and file.filename:
|
||||
is_allowed, error_msg = allowed_file(file.filename, file)
|
||||
if not is_allowed:
|
||||
flash(error_msg, 'error')
|
||||
return redirect(redirect_target)
|
||||
try:
|
||||
secure_name = secure_filename(file.filename)
|
||||
file.seek(0)
|
||||
image_bytes = file.read()
|
||||
if not image_bytes:
|
||||
continue
|
||||
optimized_io = io.BytesIO()
|
||||
with Image.open(io.BytesIO(image_bytes)) as img:
|
||||
if img.mode not in ('RGB', 'RGBA'):
|
||||
img = img.convert('RGBA')
|
||||
max_width = 800
|
||||
if img.width > max_width:
|
||||
ratio = max_width / img.width
|
||||
img = img.resize((max_width, int(img.height * ratio)), Image.Resampling.LANCZOS)
|
||||
img.save(optimized_io, format='WEBP', quality=85, optimize=True)
|
||||
optimized_io.seek(0)
|
||||
new_filename = f"{uuid.uuid4().hex}_{int(time.time())}.webp"
|
||||
fs.put(
|
||||
optimized_io,
|
||||
filename=new_filename,
|
||||
content_type='image/webp',
|
||||
metadata={'original_filename': secure_name, 'item_id': str(id)}
|
||||
)
|
||||
images.append(new_filename)
|
||||
except Exception as e:
|
||||
app.logger.error(f"Bild-Fehler bei Item {id}: {e}")
|
||||
|
||||
if ort and ort not in it.get_predefined_locations():
|
||||
it.add_predefined_location(ort)
|
||||
|
||||
# 1. Gruppen-Bestand über die neue Helfer-Funktion synchronisieren
|
||||
# 1. Gruppen-Bestand über die korrigierte Helfer-Funktion synchronisieren
|
||||
it.sync_group_codes(str(id), code_4, individual_codes)
|
||||
|
||||
# 2. Deine zentrale update_item Funktion aufrufen
|
||||
# 2. Deine bestehende update_item Funktion aufrufen
|
||||
success = it.update_item(
|
||||
id=str(id),
|
||||
name=name,
|
||||
|
||||
Reference in New Issue
Block a user