[svn] revert some of the changes (href element) so that the links work

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM

1 files changed, 18 insertions, 9 deletions

diff --git a/expo/models.py b/expo/models.py
index 59d0e11..bf8e2db 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -76,7 +76,13 @@ class Person(TroggleModel):
     mug_shot    = models.CharField(max_length=100, blank=True,null=True)

     blurb = models.TextField(blank=True,null=True)

     

-    #href        = models.CharField(max_length=200)

+    

+       # this has been put back in so that the personexpedition links work

+       # if you're going to insist on replace something that works with an over-complex, dire, inevitably-flawed pointless 

+       # and unnecessary regexp like (?P<first_name>[A-Z]*[a-z\-\']*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z\-]*)/?

+       # for no reason at all, at least make it work everywhere!

+    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

@@ -113,14 +119,14 @@ class Person(TroggleModel):
     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(TroggleModel):

@@ -209,6 +215,9 @@ class LogbookEntry(TroggleModel):
     cave    = models.ForeignKey('Cave',blank=True,null=True)

     place   = models.CharField(max_length=100,blank=True,null=True)  

     text    = models.TextField()

+    

+    # having this commented out prevents us from ever devising a regular URL, possibly based on the date of the trip 

+    # and then disambiguated depending on how many trips there are

     #href    = models.CharField(max_length=100)