From b57452f68de8f73c63222c61fdae84f900c3a190 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:54:17 +0100 Subject: [svn] Enable profile setup forms. Profiles are Person model instances, and are linked to django's built in User model by a one to one foreign key. We are using the django-registration and django-profiles pluggables. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8247 by aaron @ 2/18/2009 9:35 PM --- expo/models.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'expo/models.py') diff --git a/expo/models.py b/expo/models.py index faa4ce3..c55bfe8 100644 --- a/expo/models.py +++ b/expo/models.py @@ -66,13 +66,13 @@ class Person(models.Model): mug_shot = models.CharField(max_length=100, blank=True,null=True) blurb = models.TextField(blank=True,null=True) - href = models.CharField(max_length=200) + #href = models.CharField(max_length=200) orderref = models.CharField(max_length=200) # for alphabetic #the below have been removed and made methods. I'm not sure what the b in bisnotable stands for. - AC 16 Feb #notability = models.FloatField() # for listing the top 20 people #bisnotable = models.BooleanField() - user = models.ForeignKey(User, unique=True, null=True, blank=True) + user = models.OneToOneField(User, null=True, blank=True) def get_absolute_url(self): return settings.URL_ROOT + "/person/%s_%s/" % (self.first_name, self.last_name) @@ -93,24 +93,24 @@ class Person(models.Model): # def Lastexpedition(self): # return self.personexpedition_set.order_by('-expedition')[0] - def notability(self): - notability = 0.0 - for personexpedition in person.personexpedition_set.all(): - if not personexpedition.is_guest: - notability += 1.0 / (2012 - int(self.personexpedition.expedition.year)) - return notability - - def bisnotable(self): - return self.notability > 0.3 + #def notability(self): + #notability = 0.0 + #for personexpedition in person.personexpedition_set.all(): + #if not personexpedition.is_guest: + #notability += 1.0 / (2012 - int(self.personexpedition.expedition.year)) + #return notability + + #def bisnotable(self): + #return self.notability > 0.3 - def Sethref(self): - if self.last_name: - self.href = self.first_name.lower() + "_" + self.last_name.lower() - self.orderref = self.last_name + " " + self.first_name - else: - self.href = self.first_name.lower() - self.orderref = self.first_name - self.notability = 0.0 # set temporarily + #def Sethref(self): + #if self.last_name: + #self.href = self.first_name.lower() + "_" + self.last_name.lower() + #self.orderref = self.last_name + " " + self.first_name + #else: + # self.href = self.first_name.lower() + #self.orderref = self.first_name + #self.notability = 0.0 # set temporarily class PersonExpedition(models.Model): @@ -291,7 +291,7 @@ class Cave(models.Model): extent = models.CharField(max_length=100,blank=True,null=True) survex_file = models.CharField(max_length=100,blank=True,null=True) #should be filefield, need to fix parser first - href = models.CharField(max_length=100) + #href = models.CharField(max_length=100) def get_absolute_url(self): if self.kataster_number: -- cgit v1.2.3