From 24d90bae752dfc5d51cf038d3a5d4b3858765e9f Mon Sep 17 00:00:00 2001 From: goatchurch Date: Mon, 14 Sep 2009 22:52:46 +0100 Subject: make 2008 logbook correctly parse --- core/models_survex.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'core/models_survex.py') diff --git a/core/models_survex.py b/core/models_survex.py index 2828389..7b652b7 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -155,6 +155,9 @@ class SurvexScansFolder(models.Model): fpath = models.CharField(max_length=200) walletname = models.CharField(max_length=200) + class Meta: + ordering = ('walletname',) + def get_absolute_url(self): return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)})) @@ -163,18 +166,25 @@ class SurvexScanSingle(models.Model): name = models.CharField(max_length=200) survexscansfolder = models.ForeignKey("SurvexScansFolder", null=True) + class Meta: + ordering = ('name',) + def get_absolute_url(self): return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name})) class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) + tunnelname = models.CharField(max_length=200) bfontcolours = models.BooleanField() + survexscansfolders = models.ManyToManyField("SurvexScansFolder") survexscans = models.ManyToManyField("SurvexScanSingle") survexblocks = models.ManyToManyField("SurvexBlock") tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type filesize = models.IntegerField(default=0) npaths = models.IntegerField(default=0) + survextitles = models.ManyToManyField("SurvexTitle") + class Meta: ordering = ('tunnelpath',) -- cgit v1.2.3