diff options
author | Wookey <wookey@wookware.org> | 2011-07-10 23:30:36 +0100 |
---|---|---|
committer | Wookey <wookey@wookware.org> | 2011-07-10 23:30:36 +0100 |
commit | 1e1d63c768fb7791f278c164ded138e95fd787e5 (patch) | |
tree | 63c7e3d9693802991c6c278a7461fd577445dc8e /core/models.py | |
parent | ca6e50b8abc07c22d90d5626ade1a0a1c52d09bf (diff) | |
parent | f318105a9bed2792fa3cab017bb6a2d5c8204284 (diff) | |
download | troggle-1e1d63c768fb7791f278c164ded138e95fd787e5.tar.gz troggle-1e1d63c768fb7791f278c164ded138e95fd787e5.tar.bz2 troggle-1e1d63c768fb7791f278c164ded138e95fd787e5.zip |
merge fix from martin's tip.
Diffstat (limited to 'core/models.py')
-rw-r--r-- | core/models.py | 9 |
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'),
|