summaryrefslogtreecommitdiffstats
path: root/expo/models.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-12 05:39:30 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-12 05:39:30 +0100
commit5db52862f6d2ebcc3c3878f2442f68e3d4372d72 (patch)
tree34ae0cf6242f101e4cbfe06d66b2a18b7fa4f657 /expo/models.py
parent0ed153f2d0fd38dfe94a686621a0e70922233920 (diff)
downloadtroggle-5db52862f6d2ebcc3c3878f2442f68e3d4372d72.tar.gz
troggle-5db52862f6d2ebcc3c3878f2442f68e3d4372d72.tar.bz2
troggle-5db52862f6d2ebcc3c3878f2442f68e3d4372d72.zip
[svn] * Fix bugs that were causing broken wikilinks. *Add edit link to mugshots. *make admin url trailing-slash tolerant
Diffstat (limited to 'expo/models.py')
-rw-r--r--expo/models.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/expo/models.py b/expo/models.py
index 180f272..fd7c873 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -38,7 +38,8 @@ class TroggleImageModel(ImageModel):
return self._meta.object_name
def get_admin_url(self):
- return settings.URL_ROOT + "/admin/expo/" + self.object_name.lower() + "/" + str(self.pk)
+ return urlparse.urljoin(settings.URL_ROOT, "/admin/expo/" + self.object_name().lower() + "/" + str(self.pk))
+
class Meta:
abstract = True