From 1566923d5cf8680e5df2b43ce1b44d42a65ed590 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Thu, 9 Jul 2009 05:08:21 +0100 Subject: [svn] Make QM wikilinks work in new format, and fix cave description parser to output working wikilinks. --- core/models.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'core/models.py') diff --git a/core/models.py b/core/models.py index cb2d8d4..facc5ff 100644 --- a/core/models.py +++ b/core/models.py @@ -512,11 +512,18 @@ class CaveDescription(TroggleModel): short_name = models.CharField(max_length=50, unique = True) long_name = models.CharField(max_length=200, blank=True, null=True) description = models.TextField(blank=True,null=True) - linked_subcaves = models.ManyToManyField("NewSubCave") - linked_entrances = models.ManyToManyField("Entrance") - linked_qms = models.ManyToManyField("QM") + linked_subcaves = models.ManyToManyField("NewSubCave", blank=True,null=True) + linked_entrances = models.ManyToManyField("Entrance", blank=True,null=True) + linked_qms = models.ManyToManyField("QM", blank=True,null=True) + def __unicode__(self): - return unicode(self.short_name) + if self.long_name: + return unicode(self.long_name) + else: + return unicode(self.short_name) + + def get_absolute_url(self): + return urlparse.urljoin(settings.URL_ROOT, reverse('cavedescription', args=(self.short_name,))) class NewSubCave(TroggleModel): name = models.CharField(max_length=200, unique = True) -- cgit v1.2.3