From 5295e88be1a5d3ac1aa94ae267d839e58cc92c5d Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 12 May 2021 15:32:50 +0300 Subject: Django 3 fixes --- servo/models/order.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'servo/models/order.py') diff --git a/servo/models/order.py b/servo/models/order.py index 9640029..980ae54 100644 --- a/servo/models/order.py +++ b/servo/models/order.py @@ -10,8 +10,8 @@ from django.utils.translation import ugettext_lazy as _ from django.contrib.postgres.fields import ArrayField from django.contrib.contenttypes.fields import GenericRelation +from django.urls import reverse from django.dispatch import receiver -from django.core.urlresolvers import reverse from django.db.models.signals import pre_save, post_save, post_delete from servo import defaults @@ -898,7 +898,7 @@ class ServiceOrderItem(AbstractOrderItem): """ A product that has been added to a Service Order """ - order = models.ForeignKey(Order) + order = models.ForeignKey(Order, on_delete=models.CASCADE) dispatched = models.BooleanField( default=False, @@ -919,6 +919,7 @@ class ServiceOrderItem(AbstractOrderItem): settings.AUTH_USER_MODEL, null=True, editable=False, + on_delete=models.SET_NULL, related_name='replaced_parts' ) @@ -1037,20 +1038,22 @@ class OrderStatus(models.Model): """ The M/M statuses of an order """ - order = models.ForeignKey(Order) - status = models.ForeignKey(Status) + order = models.ForeignKey(Order, on_delete=models.CASCADE) + status = models.ForeignKey(Status, on_delete=models.CASCADE) started_at = models.DateTimeField(auto_now_add=True) finished_at = models.DateTimeField(null=True) started_by = models.ForeignKey( settings.AUTH_USER_MODEL, - related_name='+' + related_name='+', + on_delete=models.CASCADE, ) finished_by = models.ForeignKey( settings.AUTH_USER_MODEL, null=True, - related_name='+' + related_name='+', + on_delete=models.CASCADE, ) green_limit = models.DateTimeField(null=True) @@ -1128,8 +1131,9 @@ class OrderDevice(models.Model): """ A device attached to a service order """ - order = models.ForeignKey(Order) - device = models.ForeignKey(Device) + order = models.ForeignKey(Order, on_delete=models.CASCADE) + device = models.ForeignKey(Device, on_delete=models.PROTECT) + should_report = models.BooleanField(default=True) repeat_service = models.BooleanField(default=False) repair_strategies = ArrayField(models.CharField(max_length=100), @@ -1160,8 +1164,8 @@ class Accessory(models.Model): """ name = models.TextField() qty = models.IntegerField(default=1) - device = models.ForeignKey(Device) - order = models.ForeignKey(Order) + device = models.ForeignKey(Device, on_delete=models.CASCADE) + order = models.ForeignKey(Order, on_delete=models.CASCADE) def __unicode__(self): return self.name -- cgit v1.2.3