From 67e4c18ad4dd74cb9af19a4a21949d25359884d5 Mon Sep 17 00:00:00 2001 From: Galen Date: Fri, 3 May 2024 23:46:49 +0900 Subject: [PATCH] simplify control flow for bulk_delete.delete_resources, re #10781 --- arches/app/etl_modules/bulk_data_deletion.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arches/app/etl_modules/bulk_data_deletion.py b/arches/app/etl_modules/bulk_data_deletion.py index 5c9ebfbf8a8..c722fb648e7 100644 --- a/arches/app/etl_modules/bulk_data_deletion.py +++ b/arches/app/etl_modules/bulk_data_deletion.py @@ -135,12 +135,10 @@ def delete_resources(self, userid, loadid, graphid=None, resourceids=None, verbo deleted_count = 0 user = User.objects.get(id=userid) if userid else {} try: - if resourceids and graphid: - resources = Resource.objects.filter(graph_id=graphid).filter(pk__in=resourceids) + if resourceids: + resources = Resource.objects.filter(pk__in=resourceids) elif graphid: resources = Resource.objects.filter(graph_id=graphid) - elif resourceids: - resources = Resource.objects.filter(pk__in=resourceids) else: result["message"] = _("Unable to bulk delete resources as no graphid or resourceids specified.") result["deleted_count"] = 0