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
commit9b44731c338a14e45b9a6f757cdaec8bf67db77d (patch)
treefd2bdef20f9db2ac32bab87d73e229ee0f54fab6 /expo/models.py
parent5946e159bc7da2ffa757ca528fa1ca6cffa229e1 (diff)
downloadtroggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.tar.gz
troggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.tar.bz2
troggle-9b44731c338a14e45b9a6f757cdaec8bf67db77d.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