Stop using Sites, Django 3 fixes

1 files changed, 9 insertions, 15 deletions

diff --git a/servo/models/queue.py b/servo/models/queue.py
index 79fcb87..3e74783 100644
--- a/servo/models/queue.py
+++ b/servo/models/queue.py
@@ -6,18 +6,12 @@ from django.db import models
 from django.utils import timezone
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.sites.models import Site
 
 from servo import defaults
 from servo.models.common import Location
 
 
 class Queue(models.Model):
-    site = models.ForeignKey(
-        Site,
-        editable=False,
-        default=defaults.site_id
-    )
 
     title = models.CharField(
         max_length=255,
@@ -64,6 +58,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_(u'Order Created'),
         help_text=_("Order has ben placed to a queue")
     )
@@ -73,6 +68,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_(u'Order Assigned'),
         help_text=_("Order has ben assigned to a user")
     )
@@ -82,6 +78,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_("Products Ordered"),
         help_text=_("Purchase Order for this Service Order has been submitted")
     )
@@ -90,6 +87,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_("Products Received"),
         help_text=_("Products have been received")
     )
@@ -98,6 +96,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_("Repair Completed"),
         help_text=_("GSX repair completed")
     )
@@ -107,6 +106,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_("Order Dispatched")
     )
 
@@ -115,6 +115,7 @@ class Queue(models.Model):
         null=True,
         blank=True,
         related_name='+',
+        on_delete=models.SET_NULL,
         verbose_name=_("Order Closed")
     )
 
@@ -174,15 +175,9 @@ class Queue(models.Model):
         app_label = "servo"
         verbose_name = _("Queue")
         verbose_name_plural = _("Queues")
-        unique_together = ('title', 'site',)
 
 
 class Status(models.Model):
-    site = models.ForeignKey(
-        Site,
-        editable=False,
-        default=defaults.site_id
-    )
 
     FACTOR_CHOICES = (
         (60,        _('Minutes')),
@@ -235,7 +230,6 @@ class Status(models.Model):
         ordering = ('title',)
         verbose_name = _('Status')
         verbose_name_plural = _('Statuses')
-        unique_together = ('title', 'site',)
 
 
 class QueueStatus(models.Model):
@@ -243,8 +237,8 @@ class QueueStatus(models.Model):
     A status bound to a queue.
     This allows us to set time limits for each status per indiviudal queue
     """
-    queue  = models.ForeignKey(Queue)
-    status = models.ForeignKey(Status)
+    queue  = models.ForeignKey(Queue, on_delete=models.CASCADE)
+    status = models.ForeignKey(Status, on_delete=models.CASCADE)
 
     limit_green = models.IntegerField(default=1, verbose_name=_(u'Green limit'))
     limit_yellow = models.IntegerField(default=15, verbose_name=_(u'Yellow limit'))