summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-07-02 19:28:16 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-07-02 19:28:16 +0200
commit665525ef8ab702a9d4f08c1c250dd60e13e6bae2 (patch)
treedb5457b549420444e689f7556390256ab0043c4f /chimere/models.py
parent551903a0bb6ea6f0f9f1e7d81fb8132ceae563a8 (diff)
downloadChimère-665525ef8ab702a9d4f08c1c250dd60e13e6bae2.tar.bz2
Chimère-665525ef8ab702a9d4f08c1c250dd60e13e6bae2.zip
Fix "Show on map" in welcome message (refs #366)
* new templatetag: get_tinyfied_url * remove an old reference to BASE_URL
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py
index 1fab398..4fb2455 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -32,6 +32,7 @@ from django.contrib.gis.gdal import SpatialReference
from django.contrib import admin
from django.core.files import File
from django.core.exceptions import ValidationError
+from django.core.urlresolvers import reverse
from django.db.models.signals import post_save
from django import forms
from django.utils.translation import ugettext_lazy as _
@@ -417,10 +418,13 @@ class Marker(GeographicItem):
# Should we catch if not exists ?
return self.categories.all()[0]
- def get_absolute_url(self):
+ def get_absolute_url(self, area_name=''):
parameters = 'current_feature=%d&checked_categories=%s' % (self.id,
self.default_category.pk)
- return settings.BASE_URL + 'ty/' + TinyUrl.getUrnByParameters(parameters)
+ urn = TinyUrl.getUrnByParameters(parameters)
+ area_name = area_name + '/' if area_name else ''
+ url = reverse('chimere:tiny', args=[area_name, urn])
+ return url
class MultimediaType(models.Model):
MEDIA_TYPES = (('A', _(u"Audio")),