diff options
author | Philip Sargent <philip.sargent@klebos.com> | 2020-06-18 00:20:47 +0100 |
---|---|---|
committer | Philip Sargent <philip.sargent@klebos.com> | 2020-06-18 00:20:47 +0100 |
commit | ee92182163c76e52ce4ee520c101c92800ba2e4d (patch) | |
tree | 00f5d0433a88739a19318acabce0dc46965e3d9e /core/models.py | |
parent | 55dd5772758115998c2cc42fdbbf1a8c5b3ef9d0 (diff) | |
download | troggle-ee92182163c76e52ce4ee520c101c92800ba2e4d.tar.gz troggle-ee92182163c76e52ce4ee520c101c92800ba2e4d.tar.bz2 troggle-ee92182163c76e52ce4ee520c101c92800ba2e4d.zip |
n_delete=... soon to be required
Diffstat (limited to 'core/models.py')
-rw-r--r-- | core/models.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/models.py b/core/models.py index c1aa8b3..052af76 100644 --- a/core/models.py +++ b/core/models.py @@ -5,7 +5,7 @@ import logging import re from subprocess import call -import urllib.parse +from urllib.parse import urljoin from decimal import Decimal, getcontext getcontext().prec=2 #use 2 significant figures for decimal calculations @@ -53,7 +53,7 @@ class TroggleModel(models.Model): return self._meta.object_name def get_admin_url(self): - return urllib.parse.urljoin(settings.URL_ROOT, "/admin/core/" + self.object_name().lower() + "/" + str(self.pk)) + return urljoin(settings.URL_ROOT, "/admin/core/" + self.object_name().lower() + "/" + str(self.pk)) class Meta: abstract = True @@ -84,7 +84,7 @@ class Expedition(TroggleModel): get_latest_by = 'year' def get_absolute_url(self): - return urllib.parse.urljoin(settings.URL_ROOT, reverse('expedition', args=[self.year])) + return urljoin(settings.URL_ROOT, reverse('expedition', args=[self.year])) # construction function. should be moved out def get_expedition_day(self, date): @@ -105,7 +105,7 @@ class Expedition(TroggleModel): return res and res[len(res) - 1] or None class ExpeditionDay(TroggleModel): - expedition = models.ForeignKey("Expedition") + expedition = models.ForeignKey("Expedition",on_delete=models.CASCADE) date = models.DateField() class Meta: @@ -127,9 +127,9 @@ class Person(TroggleModel): #href = models.CharField(max_length=200) orderref = models.CharField(max_length=200) # for alphabetic - user = models.OneToOneField(User, null=True, blank=True) + user = models.OneToOneField(User, null=True, blank=True,on_delete=models.CASCADE) def get_absolute_url(self): - return urllib.parse.urljoin(settings.URL_ROOT,reverse('person',kwargs={'first_name':self.first_name,'last_name':self.last_name})) + return urljoin(settings.URL_ROOT,reverse('person',kwargs={'first_name':self.first_name,'last_name':self.last_name})) class Meta: verbose_name_plural = "People" @@ -168,9 +168,9 @@ class Person(TroggleModel): class PersonExpedition(TroggleModel): """Person's attendance to one Expo """ - expedition = models.ForeignKey(Expedition) - person = models.ForeignKey(Person) - slugfield = models.SlugField(max_length=50,blank=True,null=True) + expedition = models.ForeignKey(Expedition,on_delete=models.CASCADE) + person = models.ForeignKey(Person,on_delete=models.CASCADE) + slugfield = models.SlugField(max_length=50,blank=True, null=True) is_guest = models.BooleanField(default=False) COMMITTEE_CHOICES = ( @@ -181,7 +181,7 @@ class PersonExpedition(TroggleModel): ('research','Expo research coordinator'), ) expo_committee_position = models.CharField(blank=True,null=True,choices=COMMITTEE_CHOICES,max_length=200) - nickname = models.CharField(max_length=100,blank=True,null=True) + nickname = models.CharField(max_length=100,blank=True, null=True) def GetPersonroles(self): res = [ ] @@ -208,7 +208,7 @@ class PersonExpedition(TroggleModel): return self.person.first_name def get_absolute_url(self): - return urllib.parse.urljoin(settings.URL_ROOT, reverse('personexpedition',kwargs={'first_name':self.person.first_name,'last_name':self.person.last_name,'year':self.expedition.year})) + return urljoin(settings.URL_ROOT, reverse('personexpedition',kwargs={'first_name':self.person.first_name,'last_name':self.person.last_name,'year':self.expedition.year})) def surveyedleglength(self): survexblocks = [personrole.survexblock for personrole in self.personrole_set.all() ] |