simplify control flow for bulk_delete.delete_resources, re #10781

archesproject · May 3, 2024 · 67e4c18 · 67e4c18
1 parent d1d1bf3
commit 67e4c18
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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