fix(modal): add functionality to open edit modal for existing items based on URL parameters
This commit is contained in:
+12
@@ -4671,6 +4671,10 @@ def upload_item():
|
|||||||
if is_mobile:
|
if is_mobile:
|
||||||
return jsonify({'success': False, 'message': error_msg}), 400
|
return jsonify({'success': False, 'message': error_msg}), 400
|
||||||
else:
|
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')
|
flash(error_msg, 'error')
|
||||||
return redirect(url_for(success_redirect_endpoint))
|
return redirect(url_for(success_redirect_endpoint))
|
||||||
|
|
||||||
@@ -4695,6 +4699,10 @@ def upload_item():
|
|||||||
error_msg = f'Der Einzelcode "{specific_code}" wird bereits verwendet.'
|
error_msg = f'Der Einzelcode "{specific_code}" wird bereits verwendet.'
|
||||||
if is_mobile:
|
if is_mobile:
|
||||||
return jsonify({'success': False, 'message': error_msg}), 400
|
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')
|
flash(error_msg, 'error')
|
||||||
return redirect(url_for(success_redirect_endpoint))
|
return redirect(url_for(success_redirect_endpoint))
|
||||||
|
|
||||||
@@ -5826,6 +5834,10 @@ def edit_item(id):
|
|||||||
|
|
||||||
# Check if code is unique (excluding the current item)
|
# Check if code is unique (excluding the current item)
|
||||||
if code_4 and not it.is_code_unique(code_4, exclude_id=id):
|
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')
|
flash('Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.', 'error')
|
||||||
return redirect(url_for('home_admin'))
|
return redirect(url_for('home_admin'))
|
||||||
|
|
||||||
|
|||||||
@@ -3252,6 +3252,12 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
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
|
// Load saved filters
|
||||||
loadFilterState();
|
loadFilterState();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user