src/ldt/ldt/ldt_utils/models.py
changeset 922 cba34a867804
parent 908 03a00e8f2e3b
child 925 fd2d4a7a5de6
--- a/src/ldt/ldt/ldt_utils/models.py	Fri Nov 09 17:46:21 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/models.py	Fri Nov 09 18:22:43 2012 +0100
@@ -8,6 +8,7 @@
     get_current_user)
 from ldt.security.manager import SafeManager
 from ldt.security.models import SafeModel
+from ldt.utils import url as url_utils
 from sorl.thumbnail import ImageField
 from tagging.models import Tag
 from utils import (create_ldt, copy_ldt, create_empty_iri, update_iri, 
@@ -300,10 +301,13 @@
         return str(self.id) + ": " + self.iri_id
         
     def iri_url(self, web_url=settings.WEB_URL):
-        if 'http' in self.iriurl or 'https' in self.iriurl:
+        if url_utils.is_absolute(self.iriurl):
             return self.iriurl
         else:
-            return unicode(web_url) + unicode(settings.MEDIA_URL) + u"ldt/" + unicode(self.iriurl)
+            res_url = unicode(settings.MEDIA_URL) + u"ldt/" + unicode(self.iriurl)
+            if not url_utils.is_absolute(res_url):
+                res_url += unicode(web_url)
+            return res_url 
     
     def iri_file_path(self):
         return os.path.join(os.path.join(os.path.join(settings.MEDIA_ROOT, "ldt"), self.iri_id), os.path.basename(self.iriurl))