Commit 34af2bc5 authored by Marten Kenbeek's avatar Marten Kenbeek Committed by Tim Graham
Browse files

Fixed #25610 -- Reverted removal of request.current_app in {% url %} tag. 

The deprecation removal in 5e450c52
removed too much.
parent 23073f96

django/template/defaulttags.py

+5 −2
Original line number Diff line number Diff line
@@ -433,6 +433,9 @@ class URLNode(Node): 
            for k, v in self.kwargs.items()

        }

        view_name = self.view_name.resolve(context)

        try:

            current_app = context.request.current_app

        except AttributeError:

            try:

                current_app = context.request.resolver_match.namespace

            except AttributeError:

tests/template_tests/syntax_tests/test_url.py

+20 −0
Original line number Diff line number Diff line
@@ -251,3 +251,23 @@ class UrlTagTests(SimpleTestCase): 
        context = RequestContext(request)

        output = template.render(context)

        self.assertEqual(output, '/ns2/named-client/42/')



    @setup({'url-namespace-no-current-app': '{% url "app:named.client" 42 %}'})

    def test_url_namespace_no_current_app(self):

        request = RequestFactory().get('/')

        request.resolver_match = resolve('/ns1/')

        request.current_app = None

        template = self.engine.get_template('url-namespace-no-current-app')

        context = RequestContext(request)

        output = template.render(context)

        self.assertEqual(output, '/ns2/named-client/42/')



    @setup({'url-namespace-explicit-current-app': '{% url "app:named.client" 42 %}'})

    def test_url_namespace_explicit_current_app(self):

        request = RequestFactory().get('/')

        request.resolver_match = resolve('/ns1/')

        request.current_app = 'app'

        template = self.engine.get_template('url-namespace-explicit-current-app')

        context = RequestContext(request)

        output = template.render(context)

        self.assertEqual(output, '/ns2/named-client/42/')