merge fix from martin's tip.

1 files changed, 7 insertions, 2 deletions

diff --git a/core/models.py b/core/models.py
index 87f8ea9..f8e7400 100644
--- a/core/models.py
+++ b/core/models.py
@@ -174,7 +174,7 @@ class Person(TroggleModel):
 class PersonExpedition(TroggleModel):

     expedition  = models.ForeignKey(Expedition)

     person      = models.ForeignKey(Person)

-    

+    slugfield   = models.SlugField(max_length=50,blank=True,null=True)

     

     is_guest    = models.BooleanField(default=False)  

     COMMITTEE_CHOICES = (

@@ -348,6 +348,7 @@ class CaveAndEntrance(TroggleModel):
         

 class Cave(TroggleModel):

     # too much here perhaps

+    slug    = models.SlugField(max_length=50, unique = True)

     official_name = models.CharField(max_length=160)

     area = models.ManyToManyField(Area, blank=True, null=True)

     kataster_code = models.CharField(max_length=20,blank=True,null=True)

@@ -367,7 +368,7 @@ class Cave(TroggleModel):
     extent = models.CharField(max_length=100,blank=True,null=True)

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

     description_file = models.CharField(max_length=200,blank=True,null=True)

-    

+

     #class Meta:

     #    unique_together = (("area", "kataster_number"), ("area", "unofficial_number"))

     # FIXME Kataster Areas and CUCC defined sub areas need seperating    

@@ -472,6 +473,7 @@ class SurveyStation(TroggleModel):
         return unicode(self.name)

 

 class Entrance(TroggleModel):

+    slug = models.SlugField(max_length=50, unique = True)

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

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

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

@@ -573,6 +575,9 @@ class QM(TroggleModel):
     #"Number","Grade","Area","Description","Page reference","Nearest station","Completion description","Comment"

     found_by = models.ForeignKey(LogbookEntry, related_name='QMs_found',blank=True, null=True )

     ticked_off_by = models.ForeignKey(LogbookEntry, related_name='QMs_ticked_off',null=True,blank=True)

+    #cave = models.ForeignKey(Cave)

+    #expedition = models.ForeignKey(Expedition)

+

     number = models.IntegerField(help_text="this is the sequential number in the year", )

     GRADE_CHOICES=(

 	('A', 'A: Large obvious lead'),