Ticket #10944: site_url.diff

django/contrib/sites/tests.py

@@ -3 +3 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest
 from django.test import TestCase
+from django.template import Template, Context
 
 
 class SitesFrameworkTests(TestCase):
@@ -54 +55 @@
         site = get_current_site(request)
         self.assert_(isinstance(site, RequestSite))
         self.assertEqual(site.name, u"example.com")
+    
+    def test_get_url(self):
+        # Test absolute URLs builder using relative path
+        site = Site.objects.get_current()
+        self.assertEqual(u"example.com/test", site.get_url("/test"))
+
+    def test_get_site_url_tag(self):
+        out = Template(
+                "{% load sites %}"
+                "{% site_url '/test' %}"
+            ).render(Context())
+        self.assertEquals(out, "example.com/test")
+

django/contrib/sites/models.py

@@ -61 +61 @@
         except KeyError:
             pass
 
+    def get_url(self, path):
+        """Returns absolute URLs based on a given relative path"""
+        return self.domain + path
 
 class RequestSite(object):
     """

django/contrib/sites/templatetags/sites.py

@@ +1 @@
+from django import template
+from django.contrib.sites.models import Site
+from django.conf import settings
+
+register = template.Library()
+
+def site_url(path):
+    site = Site.objects.get_current()
+    return site.get_url(path)
+
+register.simple_tag(site_url)