Merge pull request #37446 from sokumon/robust-patch

This commit is contained in:
Soham Kulkarni 2026-02-24 12:59:23 +05:30 committed by GitHub
commit 23b17de20a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -239,17 +239,22 @@ def remove_orphan_entities():
all_enitities = frappe.get_all(
app_entity, filters=entity_filter_map.get(app_entity), fields=["name", "app"]
)
for i, w in enumerate(all_enitities):
if w.app and not check_if_record_exists("app", frappe.get_app_path(w.app), app_entity, w.name):
try:
print(f"Deleting entity {app_entity} {w.name}")
frappe.delete_doc(app_entity, w.name, force=True, ignore_missing=True)
update_progress_bar(f"Deleting orphaned {app_entity}", i, len(all_enitities))
print()
except Exception as e:
print(f"Error occurred while deleting entity: {app_entity} {w.name}")
print(e)
for i, entity in enumerate(all_enitities):
try:
app_path = frappe.get_app_path(entity.app)
if entity.app and not check_if_record_exists("app", app_path, app_entity, entity.name):
try:
print(f"Deleting entity {app_entity} {entity.name}")
frappe.delete_doc(app_entity, entity.name, force=True, ignore_missing=True)
update_progress_bar(f"Deleting orphaned {app_entity}", i, len(all_enitities))
print()
except Exception as e:
print(f"Error occurred while deleting entity: {app_entity} {entity.name}")
print(e)
except ModuleNotFoundError as e:
print(e)
print(f"Deleting entity {app_entity} {entity.name}")
frappe.db.delete(app_entity, {"name": entity.name})
# save the deleted icons
frappe.db.commit() # nosemgrep