This commit is contained in:
+11
-7
@@ -6451,11 +6451,6 @@ def item_edit(id):
|
|||||||
anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
|
anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
|
||||||
reservierbar = 'reservierbar' in request.form
|
reservierbar = 'reservierbar' in request.form
|
||||||
|
|
||||||
# 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'))
|
|
||||||
|
|
||||||
code_4 = sanitize_form_value(request.form.get('code_4'))
|
code_4 = sanitize_form_value(request.form.get('code_4'))
|
||||||
individual_codes_raw = request.form.get('individual_codes', '')
|
individual_codes_raw = request.form.get('individual_codes', '')
|
||||||
|
|
||||||
@@ -6490,16 +6485,26 @@ def item_edit(id):
|
|||||||
return redirect(redirect_target)
|
return redirect(redirect_target)
|
||||||
|
|
||||||
if show_library_features:
|
if show_library_features:
|
||||||
|
# LIBRARY ITEM: Process ISBN/Medientyp/Category, preserve existing filters
|
||||||
isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
|
isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
|
||||||
item_isbn = normalize_and_validate_isbn(isbn_raw) if isbn_raw else ''
|
item_isbn = normalize_and_validate_isbn(isbn_raw) if isbn_raw else ''
|
||||||
item_type = sanitize_form_value(request.form.get('item_type_input', current_item.get('ItemType', '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', ''))
|
library_category = sanitize_form_value(request.form.get('library_category', ''))
|
||||||
images = current_item.get('Images', [])
|
images = current_item.get('Images', [])
|
||||||
|
|
||||||
|
filter1 = current_item.get('Filter', [])
|
||||||
|
filter2 = current_item.get('Filter2', [])
|
||||||
|
filter3 = current_item.get('Filter3', [])
|
||||||
else:
|
else:
|
||||||
|
# NON-LIBRARY (INVENTORY) ITEM: Process Filter 1-3 from form
|
||||||
item_isbn = current_item.get('ISBN', '')
|
item_isbn = current_item.get('ISBN', '')
|
||||||
item_type = current_item.get('ItemType', 'other')
|
item_type = 'other'
|
||||||
library_category = current_item.get('library_category', '')
|
library_category = current_item.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'))
|
||||||
|
|
||||||
images_to_keep = request.form.getlist('existing_images')
|
images_to_keep = request.form.getlist('existing_images')
|
||||||
original_images = current_item.get('Images', [])
|
original_images = current_item.get('Images', [])
|
||||||
images = [img for img in original_images if img in images_to_keep]
|
images = [img for img in original_images if img in images_to_keep]
|
||||||
@@ -6539,7 +6544,6 @@ def item_edit(id):
|
|||||||
images.append(new_filename)
|
images.append(new_filename)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
app.logger.error(f"Image error for item {id}: {e}")
|
app.logger.error(f"Image error for item {id}: {e}")
|
||||||
|
|
||||||
if ort and ort not in it.get_predefined_locations():
|
if ort and ort not in it.get_predefined_locations():
|
||||||
it.add_predefined_location(ort)
|
it.add_predefined_location(ort)
|
||||||
|
|
||||||
|
|||||||
@@ -271,7 +271,8 @@
|
|||||||
<small style="display:block; color:#666; margin-top: 5px;">Der Basis-Code steht oben. Alle weiteren Gruppenmitglieder werden hier untereinander aufgeführt.</small>
|
<small style="display:block; color:#666; margin-top: 5px;">Der Basis-Code steht oben. Alle weiteren Gruppenmitglieder werden hier untereinander aufgeführt.</small>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ================= SYSTEM FILTERS 1-3 (ALWAYS RENDERED) ================= -->
|
{% if not show_library_features %}
|
||||||
|
<!-- ================= SYSTEM FILTERS 1-3 (INVENTORY / OTHER ITEMS ONLY) ================= -->
|
||||||
<div class="filter-inputs">
|
<div class="filter-inputs">
|
||||||
<h3>Unterrichtsfach (Filter 1):</h3>
|
<h3>Unterrichtsfach (Filter 1):</h3>
|
||||||
<div class="multi-filter">
|
<div class="multi-filter">
|
||||||
@@ -307,6 +308,7 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<!-- ================= DATES & FINANCIALS ================= -->
|
<!-- ================= DATES & FINANCIALS ================= -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@@ -488,9 +490,11 @@
|
|||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
loadLocationOptions();
|
loadLocationOptions();
|
||||||
|
|
||||||
// Always load Filter 1 and Filter 2 options for all items
|
// Load Filter options if elements exist on page
|
||||||
|
if (document.getElementById('filter1-1')) {
|
||||||
loadAndSelectFilterValues(1);
|
loadAndSelectFilterValues(1);
|
||||||
loadAndSelectFilterValues(2);
|
loadAndSelectFilterValues(2);
|
||||||
|
}
|
||||||
|
|
||||||
const scanCodeBtn = document.getElementById('scan-code4-btn');
|
const scanCodeBtn = document.getElementById('scan-code4-btn');
|
||||||
if (scanCodeBtn) scanCodeBtn.addEventListener('click', startCode4Scanner);
|
if (scanCodeBtn) scanCodeBtn.addEventListener('click', startCode4Scanner);
|
||||||
|
|||||||
Reference in New Issue
Block a user