Explorar el Código

Called super delete method before deleting JobResult task.
Done to avoid having deleted a task on accident if the deleting of the JobResult fails.

kkthxbye-code hace 3 años
padre
commit
ef0b455b05
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      netbox/extras/models/models.py

+ 2 - 2
netbox/extras/models/models.py

@@ -534,14 +534,14 @@ class JobResult(models.Model):
         return str(self.job_id)
         return str(self.job_id)
 
 
     def delete(self, *args, **kwargs):
     def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+
         queue = django_rq.get_queue("default")
         queue = django_rq.get_queue("default")
         job = queue.fetch_job(str(self.job_id))
         job = queue.fetch_job(str(self.job_id))
 
 
         if job:
         if job:
             job.cancel()
             job.cancel()
 
 
-        return super().delete(*args, **kwargs)
-
     def get_absolute_url(self):
     def get_absolute_url(self):
         return reverse(f'extras:{self.obj_type.name}_result', args=[self.pk])
         return reverse(f'extras:{self.obj_type.name}_result', args=[self.pk])