NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-04 06:38:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes: #17648 - Fix exception thrown in Job.delete() when no object_type specified

Browse Source
This commit is contained in:
Daniel Sheppard 2024-10-02 08:41:03 -05:00
parent 5b2f2e1da6
commit 1f24876c4f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/core/models/jobs.py
View File

@ -118,9 +118,9 @@ class Job(models.Model):
def get_absolute_url(self): def get_absolute_url(self):
# TODO: Employ dynamic registration # TODO: Employ dynamic registration
if self.object_type.model == 'reportmodule': if self.object_type and self.object_type.model == 'reportmodule':
return reverse(f'extras:report_result', kwargs={'job_pk': self.pk}) return reverse(f'extras:report_result', kwargs={'job_pk': self.pk})
if self.object_type.model == 'scriptmodule': elif self.object_type and self.object_type.model == 'scriptmodule':
return reverse(f'extras:script_result', kwargs={'job_pk': self.pk}) return reverse(f'extras:script_result', kwargs={'job_pk': self.pk})
return reverse('core:job', args=[self.pk]) return reverse('core:job', args=[self.pk])
@ -154,7 +154,7 @@ class Job(models.Model):
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
super().delete(*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) queue = django_rq.get_queue(rq_queue_name)
job = queue.fetch_job(str(self.job_id)) job = queue.fetch_job(str(self.job_id))