diff --git a/src/pretix/helpers/urls.py b/src/pretix/helpers/urls.py index f551e907b..21624ff77 100644 --- a/src/pretix/helpers/urls.py +++ b/src/pretix/helpers/urls.py @@ -4,6 +4,4 @@ from django.core.urlresolvers import reverse def build_absolute_uri(urlname, args=None, kwargs=None): - # Pass prefix='' as a possible SCRIPT_PREFIX (if pretix runs in a subdirectory) - # is included in SITE_URL _and_ is added by reverse. - return urljoin(settings.SITE_URL, reverse(urlname, args=args, kwargs=kwargs, prefix='')) + return urljoin(settings.SITE_URL, reverse(urlname, args=args, kwargs=kwargs)) diff --git a/src/tests/helpers/__init__.py b/src/tests/helpers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/src/tests/helpers/test_urls.py b/src/tests/helpers/test_urls.py new file mode 100644 index 000000000..c9b054aa6 --- /dev/null +++ b/src/tests/helpers/test_urls.py @@ -0,0 +1,14 @@ +from django.conf import settings +from pretix.helpers.urls import build_absolute_uri +from django.core import urlresolvers + + +def test_site_url_domain(): + settings.SITE_URL = 'https://example.com' + assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login' + + +def test_site_url_subpath(): + settings.SITE_URL = 'https://example.com/presale' + urlresolvers.set_script_prefix('/presale/') + assert build_absolute_uri('control:auth.login') == 'https://example.com/presale/control/login'