Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #18862 -- Honored script prefix in FlatPage.get_absolute_url.

  • Loading branch information...
commit a44531ae1592cf266e6c24387f49d665c639b480 1 parent 4b01ee7
Aymeric Augustin aaugustin authored
4 django/contrib/flatpages/models.py
View
@@ -2,6 +2,7 @@
from django.db import models
from django.contrib.sites.models import Site
+from django.core.urlresolvers import get_script_prefix
from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import iri_to_uri, python_2_unicode_compatible
@@ -26,4 +27,5 @@ def __str__(self):
return "%s -- %s" % (self.url, self.title)
def get_absolute_url(self):
- return iri_to_uri(self.url)
+ # Handle script prefix manually because we bypass reverse()
+ return iri_to_uri(get_script_prefix().rstrip('/') + self.url)
9 django/contrib/flatpages/tests/models.py
View
@@ -2,6 +2,7 @@
from __future__ import unicode_literals
+from django.core.urlresolvers import set_script_prefix, clear_script_prefix
from django.contrib.flatpages.models import FlatPage
from django.test import TestCase
@@ -12,4 +13,10 @@ def test_get_absolute_url_urlencodes(self):
pf = FlatPage(title="Café!", url='/café/')
self.assertEqual(pf.get_absolute_url(), '/caf%C3%A9/')
-
+ def test_get_absolute_url_honors_script_prefix(self):
+ pf = FlatPage(title="Tea!", url='/tea/')
+ set_script_prefix('/beverages/')
+ try:
+ self.assertEqual(pf.get_absolute_url(), '/beverages/tea/')
+ finally:
+ clear_script_prefix()
9 django/core/urlresolvers.py
View
@@ -521,6 +521,15 @@ def get_script_prefix():
"""
return getattr(_prefixes, "value", '/')
+def clear_script_prefix():
+ """
+ Unsets the script prefix for the current thread.
+ """
+ try:
+ del _prefixes.value
+ except AttributeError:
+ pass
+
def set_urlconf(urlconf_name):
"""
Sets the URLconf for the current thread (overriding the default one in
Please sign in to comment.
Something went wrong with that request. Please try again.