ForeignKey: SET_NULL fix

1 files changed, 8 insertions, 4 deletions

diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 162692e20..843d0d1e9 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -27,8 +27,7 @@ from django.db import IntegrityError, transaction
 from django.db.models import Q, Count, Sum, Max, Avg
 from django.db.models.signals import post_save, m2m_changed, post_delete
 from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy, \
-    activate, deactivate
+from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.models import BaseHistorizedItem, Dashboard, \
     DashboardFormItem, Department, Document, DocumentTemplate, \
@@ -58,6 +57,7 @@ class Period(GeneralType):
     start_date = models.IntegerField(_(u"Start date"), null=True, blank=True)
     end_date = models.IntegerField(_(u"End date"), null=True, blank=True)
     parent = models.ForeignKey("Period", verbose_name=_(u"Parent period"),
+                               on_delete=models.SET_NULL,
                                blank=True, null=True)
 
     class Meta:
@@ -787,6 +787,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
     associated_file = models.ForeignKey(
         'archaeological_files.File',
         related_name='operations', verbose_name=_(u"File"),
+        on_delete=models.SET_NULL,
         blank=True, null=True)
     operation_type = models.ForeignKey(OperationType, related_name='+',
                                        verbose_name=_(u"Operation type"))
@@ -810,6 +811,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
                                              blank=True, null=True)
     report_processing = models.ForeignKey(
         ReportState, verbose_name=_(u"Report processing"),
+        on_delete=models.SET_NULL,
         blank=True, null=True)
     old_code = models.CharField(_(u"Old code"), max_length=200, null=True,
                                 blank=True)
@@ -868,6 +870,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
             u"officialy registered."))
     record_quality_type = models.ForeignKey(
         RecordQualityType, verbose_name=_(u"Record quality"),
+        on_delete=models.SET_NULL,
         null=True, blank=True,)
     abstract = models.TextField(_(u"Abstract"), null=True, blank=True)
     documentation_deadline = models.DateField(
@@ -1488,6 +1491,7 @@ class OperationByDepartment(models.Model):
 
     operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"))
     department = models.ForeignKey(Department, verbose_name=_(u"Department"),
+                                   on_delete=models.DO_NOTHING,
                                    blank=True, null=True)
 
     class Meta:
@@ -2007,10 +2011,10 @@ class Parcel(LightHistorizedItem):
     associated_file = models.ForeignKey(
         'archaeological_files.File',
         related_name='parcels', verbose_name=_(u"File"),
-        blank=True, null=True, on_delete=models.CASCADE)
+        blank=True, null=True, on_delete=models.SET_NULL)
     operation = models.ForeignKey(
         Operation, related_name='parcels', blank=True, null=True,
-        verbose_name=_(u"Operation"), on_delete=models.CASCADE)
+        verbose_name=_(u"Operation"), on_delete=models.SET_NULL)
     year = models.IntegerField(_(u"Year"), blank=True, null=True)
     town = models.ForeignKey(Town, related_name='parcels',
                              verbose_name=_(u"Town"))