From 2fd23f35c878c2ac28d21318fe73f1ad13f2f9c5 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 7 Oct 2024 07:59:48 -0500 Subject: [PATCH] Fixes: #17648 - Fix exception thrown in `Job.delete()` when no object_type specified (#17657) * Fixes: #17648 - Fix exception thrown in `Job.delete()` when no object_type specified * Remove unrelated fix * Change back elif to if * Remove unused imports --------- Co-authored-by: Jeremy Stretch --- netbox/core/models/jobs.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/netbox/core/models/jobs.py b/netbox/core/models/jobs.py index 2327dedb3..655647ebb 100644 --- a/netbox/core/models/jobs.py +++ b/netbox/core/models/jobs.py @@ -13,8 +13,6 @@ from django.utils.translation import gettext as _ from core.choices import JobStatusChoices from core.models import ObjectType from core.signals import job_end, job_start -from netbox.config import get_config -from netbox.constants import RQ_QUEUE_DEFAULT from utilities.querysets import RestrictedQuerySet from utilities.rqworker import get_queue_for_model @@ -155,7 +153,7 @@ class Job(models.Model): def delete(self, *args, **kwargs): super().delete(*args, **kwargs) - rq_queue_name = get_config().QUEUE_MAPPINGS.get(self.object_type.model, RQ_QUEUE_DEFAULT) + rq_queue_name = get_queue_for_model(self.object_type.model if self.object_type else None) queue = django_rq.get_queue(rq_queue_name) job = queue.fetch_job(str(self.job_id))