Migration to Django 2.2 - missing on_delete - django.urls import reverse

3 files changed, 14 insertions, 14 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index c8a328633..3a6c2d8c5 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -28,7 +28,7 @@ from django.core.cache import cache
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.db.models import Q, Count, Sum, Max
 from django.db.models.signals import post_save, m2m_changed, post_delete
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.utils import (
@@ -107,7 +107,7 @@ class Job(GeneralType):
         null=True,
         verbose_name=_("Child"),
         help_text=_("Auto-add this job when a parent is added"),
-        related_name="parents",
+        related_name="parents", on_delete=models.SET_NULL,
     )
 
     class Meta:
@@ -166,7 +166,7 @@ class GenericEquipmentServiceType(GeneralType):
 
 class EquipmentServiceType(GeneralType):
     generic_equipment_type = models.ForeignKey(
-        GenericEquipmentServiceType, verbose_name=_("Generic type")
+        GenericEquipmentServiceType, verbose_name=_("Generic type"), on_delete=models.CASCADE
     )
     order = models.IntegerField(_("Order"), default=10)
 
@@ -202,7 +202,7 @@ class EquipmentServiceCost(models.Model):
         on_delete=models.CASCADE
     )
     equipment_service_type = models.ForeignKey(
-        EquipmentServiceType, verbose_name=_("Equipment/Service")
+        EquipmentServiceType, verbose_name=_("Equipment/Service"), on_delete=models.CASCADE
     )
     slug = models.SlugField(
         _("Textual ID"),
@@ -532,7 +532,7 @@ class File(
         _("External ID is set automatically"), default=False
     )
     name = models.TextField(_("Name"), blank=True, default="")
-    file_type = models.ForeignKey(FileType, verbose_name=_("File type"))
+    file_type = models.ForeignKey(FileType, verbose_name=_("File type"), on_delete=models.PROTECT)
     in_charge = models.ForeignKey(
         Person,
         related_name="file_responsability",
@@ -1313,7 +1313,7 @@ class FileByDepartment(models.Model):
     DELETE_SQL = """
     DROP VIEW IF EXISTS file_department;
     """
-    file = models.ForeignKey(File, verbose_name=_("File"))
+    file = models.ForeignKey(File, verbose_name=_("File"), on_delete=models.DO_NOTHING)
     department = models.ForeignKey(
         Department,
         verbose_name=_("Department"),
@@ -1505,8 +1505,8 @@ class ManDays(models.Model):
 
 
 class PreventiveFileGroundJob(ManDays):
-    file = models.ForeignKey(File, related_name="ground_jobs")
-    job = models.ForeignKey(Job, verbose_name=_("Job"))
+    file = models.ForeignKey(File, related_name="ground_jobs", on_delete=models.CASCADE)
+    job = models.ForeignKey(Job, on_delete=models.CASCADE, verbose_name=_("Job"))
 
     class Meta:
         ordering = ("job",)
@@ -1521,8 +1521,8 @@ class PreventiveFileGroundJob(ManDays):
 
 
 class PreventiveFileJob(ManDays):
-    file = models.ForeignKey(File, related_name="jobs")
-    job = models.ForeignKey(Job, verbose_name=_("Job"))
+    file = models.ForeignKey(File, related_name="jobs", on_delete=models.CASCADE)
+    job = models.ForeignKey(Job, on_delete=models.CASCADE, verbose_name=_("Job"))
 
     class Meta:
         ordering = ("job",)
@@ -1537,8 +1537,8 @@ class PreventiveFileJob(ManDays):
 
 
 class PreventiveFileEquipmentServiceCost(models.Model):
-    file = models.ForeignKey(File, related_name="equipment_costs")
-    equipment_service_cost = models.ForeignKey(EquipmentServiceCost)
+    file = models.ForeignKey(File, related_name="equipment_costs", on_delete=models.CASCADE)
+    equipment_service_cost = models.ForeignKey(EquipmentServiceCost, on_delete=models.CASCADE)
     quantity_by_day_planned = models.FloatField(
         _("Quantity by day - planned"), null=True, blank=True
     )
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index fc9483830..947f328a8 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -22,8 +22,8 @@ import json
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.test.client import Client
+from django.urls import reverse
 
 from ishtar_common.tests import (
     TestCase,
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index eaeccd1ad..95aa0c9c1 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -20,12 +20,12 @@
 import json
 import re
 
-from django.core.urlresolvers import reverse
 from django.db.models import Q, F
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.forms.formsets import formset_factory
 from django.views.generic.edit import UpdateView
 from django.shortcuts import redirect, render
+from django.urls import reverse
 from ishtar_common.utils import ugettext_lazy as _
 
 from ishtar_common.views import wizard_is_available