Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cded7b02fe | |||
| f314b5ae70 | |||
| 77c4e1b4c5 | |||
| e17f098c47 | |||
| f41acc78cd |
+12
@@ -4671,6 +4671,10 @@ def upload_item():
|
||||
if is_mobile:
|
||||
return jsonify({'success': False, 'message': error_msg}), 400
|
||||
else:
|
||||
conflicting_items = it.get_item_by_code_4(code_4[0])
|
||||
if conflicting_items:
|
||||
flash('Der Code wird bereits verwendet. Das existierende Element wurde geöffnet.', 'info')
|
||||
return redirect(url_for(success_redirect_endpoint, open_item_modal=str(conflicting_items[0]['_id'])))
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
@@ -4695,6 +4699,10 @@ def upload_item():
|
||||
error_msg = f'Der Einzelcode "{specific_code}" wird bereits verwendet.'
|
||||
if is_mobile:
|
||||
return jsonify({'success': False, 'message': error_msg}), 400
|
||||
conflicting_items = it.get_item_by_code_4(specific_code)
|
||||
if conflicting_items:
|
||||
flash(f'Der Einzelcode "{specific_code}" wird bereits verwendet. Das existierende Element wurde geöffnet.', 'info')
|
||||
return redirect(url_for(success_redirect_endpoint, open_item_modal=str(conflicting_items[0]['_id'])))
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
@@ -5826,6 +5834,10 @@ def edit_item(id):
|
||||
|
||||
# Check if code is unique (excluding the current item)
|
||||
if code_4 and not it.is_code_unique(code_4, exclude_id=id):
|
||||
conflicting_items = it.get_item_by_code_4(code_4)
|
||||
if conflicting_items:
|
||||
flash('Der Code wird bereits verwendet. Das existierende Element wurde stattdessen geöffnet.', 'info')
|
||||
return redirect(url_for('home_admin', open_item_modal=str(conflicting_items[0]['_id'])))
|
||||
flash('Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.', 'error')
|
||||
return redirect(url_for('home_admin'))
|
||||
|
||||
|
||||
@@ -230,6 +230,7 @@ MODULES.register('library', LIBRARY_MODULE_ENABLED, _match_library)
|
||||
MODULES.register('student_cards', STUDENT_CARDS_MODULE_ENABLED, _match_student_cards)
|
||||
|
||||
STUDENT_DEFAULT_BORROW_DAYS = int(_get(_conf, ['modules', 'student_cards', 'default_borrow_days'], DEFAULTS['modules']['student_cards']['default_borrow_days']))
|
||||
STUDENT_MAX_BORROW_DAYS = int(_get(_conf, ["modules", "student_cards", "max_borrow_days"], DEFAULTS["modules"]["student_cards"]["max_borrow_days"]))
|
||||
|
||||
# Upload/paths
|
||||
ALLOWED_EXTENSIONS = set(_get(_conf, ['allowed_extensions'], DEFAULTS['upload']['allowed_extensions']))
|
||||
|
||||
@@ -3252,6 +3252,12 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const openItem = urlParams.get('open_item_modal');
|
||||
if (openItem) {
|
||||
openEditModalFromServer(openItem);
|
||||
}
|
||||
|
||||
// Load saved filters
|
||||
loadFilterState();
|
||||
|
||||
|
||||
@@ -96,6 +96,10 @@ def get_tenant_config(tenant_id=None):
|
||||
|
||||
if tenant_id in TENANT_REGISTRY:
|
||||
return TENANT_REGISTRY[tenant_id] or {}
|
||||
|
||||
for alias in _tenant_db_aliases(tenant_id):
|
||||
if alias in TENANT_REGISTRY:
|
||||
return TENANT_REGISTRY[alias] or {}
|
||||
|
||||
return TENANT_REGISTRY.get('default', {}) or {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user