summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Green <martin.speleo@gmail.com>2011-07-11 22:35:32 +0100
committerMartin Green <martin.speleo@gmail.com>2011-07-11 22:35:32 +0100
commitd3fb0352be51c847b124c91532e1b580f5aea57f (patch)
tree9ab7a774a41a509477d604eae8ae824ac0e0ae8a
parent0183f9478033cf6eec15613b2cedb379c41ced47 (diff)
downloadtroggle-d3fb0352be51c847b124c91532e1b580f5aea57f.tar.gz
troggle-d3fb0352be51c847b124c91532e1b580f5aea57f.tar.bz2
troggle-d3fb0352be51c847b124c91532e1b580f5aea57f.zip
Change absolute url for caves to there expoweb url, such that links work
-rw-r--r--core/models.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/core/models.py b/core/models.py
index 1c08a25..d199073 100644
--- a/core/models.py
+++ b/core/models.py
@@ -384,14 +384,15 @@ class Cave(TroggleModel):
return "%s-%s" % (self.kat_area(), self.unofficial_number)
def get_absolute_url(self):
- if self.kataster_number:
- href = self.kataster_number
- elif self.unofficial_number:
- href = self.unofficial_number
- else:
- href = official_name.lower()
- #return settings.URL_ROOT + '/cave/' + href + '/'
- return urlparse.urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,}))
+ return urlparse.urljoin(settings.URL_ROOT, self.url)
+ #if self.kataster_number:
+ # href = self.kataster_number
+ #elif self.unofficial_number:
+ # href = self.unofficial_number
+ #else:
+ # href = official_name.lower()
+ ##return settings.URL_ROOT + '/cave/' + href + '/'
+ #return urlparse.urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,}))
def __unicode__(self):
if self.kataster_number: