Fix of a naming error in the repair resolver
Release Inventarsystem / release-docker (push) Successful in 2m17s
Release Inventarsystem / release-docker (push) Successful in 2m17s
This commit is contained in:
+13
-12
@@ -9132,7 +9132,7 @@ def admin_resolve_repair(item_id):
|
||||
flash('Ihnen fehlen die nötigen Berechtigungen für diese Aktion.', 'error')
|
||||
return redirect(url_for('home_admin'))
|
||||
|
||||
action = request.form.get('action_type', 'repair')
|
||||
action = request.form.get('action', 'repair')
|
||||
new_code_4 = request.form.get('new_code_4', '')
|
||||
current_user = session.get('username', 'admin')
|
||||
|
||||
@@ -9178,7 +9178,6 @@ def resolve_repaired_item_funct(item_id, action, new_code_4="", current_user="ad
|
||||
if sibling:
|
||||
new_parent_id_str = str(sibling['_id'])
|
||||
|
||||
# 1. Mache das Geschwister-Item zum neuen Parent
|
||||
items.update_one(
|
||||
{'_id': sibling['_id']},
|
||||
{'$set': {
|
||||
@@ -9187,7 +9186,6 @@ def resolve_repaired_item_funct(item_id, action, new_code_4="", current_user="ad
|
||||
}}
|
||||
)
|
||||
|
||||
# 2. Leite alle anderen verbleibenden Sub-Items auf den neuen Parent um
|
||||
items.update_many(
|
||||
{
|
||||
'SeriesGroupId': series_group_id,
|
||||
@@ -9196,17 +9194,8 @@ def resolve_repaired_item_funct(item_id, action, new_code_4="", current_user="ad
|
||||
{'$set': {'ParentItemId': new_parent_id_str}}
|
||||
)
|
||||
|
||||
# Physisch aus der Datenbank löschen (Hard Delete)
|
||||
items.delete_one({'_id': ObjectId(item_id)})
|
||||
|
||||
# ALTERNATIVE (Soft Delete have to see if it makes sense):
|
||||
# now = datetime.datetime.now()
|
||||
# items.update_one(
|
||||
# {'_id': ObjectId(item_id)},
|
||||
# {'$set': {'Deleted': True, 'DeletedAt': now, 'DeletedBy': current_user}}
|
||||
# )
|
||||
|
||||
# SeriesCount bei ALLEN verbleibenden Items dieser Serie um 1 reduzieren
|
||||
if series_group_id:
|
||||
items.update_many(
|
||||
{'SeriesGroupId': series_group_id},
|
||||
@@ -9222,6 +9211,12 @@ def resolve_repaired_item_funct(item_id, action, new_code_4="", current_user="ad
|
||||
{'$set': {
|
||||
'Code_4': str(new_code_4).strip(),
|
||||
'Verfuegbar': True,
|
||||
'HasDamage': False,
|
||||
'has_damage': False,
|
||||
'DamageCount': 0,
|
||||
'damage_count': 0,
|
||||
'DamageText': '',
|
||||
'damage_text': '',
|
||||
'LastUpdated': datetime.datetime.now()
|
||||
}}
|
||||
)
|
||||
@@ -9233,6 +9228,12 @@ def resolve_repaired_item_funct(item_id, action, new_code_4="", current_user="ad
|
||||
{'_id': ObjectId(item_id)},
|
||||
{'$set': {
|
||||
'Verfuegbar': True,
|
||||
'HasDamage': False,
|
||||
'has_damage': False,
|
||||
'DamageCount': 0,
|
||||
'damage_count': 0,
|
||||
'DamageText': '',
|
||||
'damage_text': '',
|
||||
'LastUpdated': datetime.datetime.now()
|
||||
}}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user