diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-09-01 17:58:56 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:20:58 +0100 |
commit | 3b671732319aa14f194821a8f547ae280e1e0648 (patch) | |
tree | aa16f6f20916eecc7a99d9eed661d8bd1ddf9522 /archaeological_finds | |
parent | e416f8d0702e2f3f981b50aebc08c67f7034d6a1 (diff) | |
download | Ishtar-3b671732319aa14f194821a8f547ae280e1e0648.tar.bz2 Ishtar-3b671732319aa14f194821a8f547ae280e1e0648.zip |
Migration to Django 2.2 - missing on_delete - django.urls import reverse
Diffstat (limited to 'archaeological_finds')
-rw-r--r-- | archaeological_finds/models_finds.py | 25 | ||||
-rw-r--r-- | archaeological_finds/models_treatments.py | 25 | ||||
-rw-r--r-- | archaeological_finds/tests.py | 2 | ||||
-rw-r--r-- | archaeological_finds/views.py | 3 |
4 files changed, 41 insertions, 14 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 2c2fffd00..63afb9dff 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -25,11 +25,11 @@ from django.apps import apps from django.conf import settings from django.contrib.gis.db import models from django.contrib.postgres.indexes import GinIndex -from django.core.urlresolvers import reverse from django.db import connection from django.db.models import Max, Q, F from django.db.models.signals import m2m_changed, post_save, post_delete, pre_delete from django.core.exceptions import ObjectDoesNotExist +from django.urls import reverse from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy from ishtar_common.data_importer import post_importer_action, ImporterError @@ -407,7 +407,10 @@ class BaseFind( _("Special interest"), blank=True, default="", max_length=120 ) context_record = models.ForeignKey( - ContextRecord, related_name="base_finds", verbose_name=_("Context Record") + ContextRecord, + related_name="base_finds", + verbose_name=_("Context Record"), + on_delete=models.CASCADE, ) discovery_date = models.DateField( _("Discovery date (exact or TPQ)"), blank=True, null=True @@ -3244,12 +3247,17 @@ class FindInsideContainer(models.Model): SLUG = "find_inside_container" find = models.OneToOneField( - Find, verbose_name=_("Find"), related_name="inside_container", primary_key=True + Find, + verbose_name=_("Find"), + related_name="inside_container", + primary_key=True, + on_delete=models.DO_NOTHING, ) container = models.ForeignKey( "archaeological_warehouse.Container", verbose_name=_("Container"), related_name="container_content", + on_delete=models.DO_NOTHING, ) class Meta: @@ -3262,12 +3270,17 @@ for attr in Find.HISTORICAL_M2M: class Property(LightHistorizedItem): - find = models.ForeignKey(Find, verbose_name=_("Find")) + find = models.ForeignKey(Find, verbose_name=_("Find"), on_delete=models.CASCADE) administrative_act = models.ForeignKey( - AdministrativeAct, verbose_name=_("Administrative act") + AdministrativeAct, + verbose_name=_("Administrative act"), + on_delete=models.CASCADE, ) person = models.ForeignKey( - Person, verbose_name=_("Person"), related_name="properties" + Person, + verbose_name=_("Person"), + related_name="properties", + on_delete=models.CASCADE, ) start_date = models.DateField(_("Start date")) end_date = models.DateField(_("End date")) diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 5d4597b19..7cbf0334a 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -22,10 +22,10 @@ import datetime from django.conf import settings from django.contrib.gis.db import models from django.contrib.postgres.indexes import GinIndex -from django.core.urlresolvers import reverse from django.db.models import Max, Q from django.db.models.signals import post_save, post_delete, pre_delete, m2m_changed from django.template.defaultfilters import slugify +from django.urls import reverse from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy from archaeological_finds.models_finds import Find, FindBasket, TreatmentType @@ -208,7 +208,10 @@ class Treatment( TreatmentType, verbose_name=_("Treatment type") ) treatment_state = models.ForeignKey( - TreatmentState, verbose_name=_("State"), default=TreatmentState.get_default + TreatmentState, + verbose_name=_("State"), + default=TreatmentState.get_default, + on_delete=models.PROTECT, ) executed = models.BooleanField(_("Treatment have been executed"), default=False) location = models.ForeignKey( @@ -728,10 +731,16 @@ for attr in Treatment.HISTORICAL_M2M: class AbsFindTreatments(models.Model): find = models.ForeignKey( - Find, verbose_name=_("Find"), related_name="%(class)s_related" + Find, + verbose_name=_("Find"), + related_name="%(class)s_related", + on_delete=models.DO_NOTHING, ) treatment = models.OneToOneField( - Treatment, verbose_name=_("Treatment"), primary_key=True + Treatment, + verbose_name=_("Treatment"), + primary_key=True, + on_delete=models.DO_NOTHING, ) # primary_key is set to prevent django to ask for an id column # treatment is not a real primary key @@ -981,7 +990,9 @@ class FindTreatments(AbsFindTreatments): class TreatmentFileType(GeneralType): - treatment_type = models.ForeignKey(TreatmentType, blank=True, null=True) + treatment_type = models.ForeignKey( + TreatmentType, blank=True, null=True, on_delete=models.SET_NULL + ) class Meta: verbose_name = _("Treatment request type") @@ -1091,7 +1102,9 @@ class TreatmentFile( ) name = models.TextField(_("Name"), blank=True, default="") type = models.ForeignKey( - TreatmentFileType, verbose_name=_("Treatment request type") + TreatmentFileType, + verbose_name=_("Treatment request type"), + on_delete=models.PROTECT, ) in_charge = models.ForeignKey( Person, diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 0949972b3..3fd7d56e2 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -33,9 +33,9 @@ from django.contrib.auth.models import User, Permission, ContentType from django.contrib.gis.geos import GEOSGeometry from django.core.files import File from django.core.files.uploadedfile import SimpleUploadedFile -from django.core.urlresolvers import reverse from django.test import tag from django.test.client import Client +from django.urls import reverse from ishtar_common.models import ( ImporterType, IshtarUser, diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 3a8d291ab..4f5e64475 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -26,10 +26,11 @@ from rest_framework.response import Response from django.conf import settings from django.core.exceptions import PermissionDenied -from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.shortcuts import redirect +from django.urls import reverse + from ishtar_common.utils import ugettext_lazy as _ from django.views.generic import TemplateView from django.views.generic.edit import CreateView, FormView |