From 9b44731c338a14e45b9a6f757cdaec8bf67db77d Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Fri, 12 Jun 2009 05:39:30 +0100
Subject: [svn] * Fix bugs that were causing broken wikilinks. *Add edit link
 to mugshots. *make admin url trailing-slash tolerant

---
 expo/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'expo/models.py')

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
-- 
cgit v1.2.3