Ticket #5408: 5408.patch

django/template/defaulttags.py

@@ -331 +331 @@
         return self.mapping.get(self.tagtype, '')
 
 class URLNode(Node):
-    def __init__(self, view_name, args, kwargs):
-        self.view_name = view_name
+    def __init__(self, view_var_or_name, args, kwargs):
+        self.view_var_or_name = view_var_or_name
         self.args = args
         self.kwargs = kwargs
 
@@ -340 +340 @@
         from django.core.urlresolvers import reverse, NoReverseMatch
         args = [arg.resolve(context) for arg in self.args]
         kwargs = dict([(smart_str(k,'ascii'), v.resolve(context)) for k, v in self.kwargs.items()])
+        view_name = resolve_variable(self.view_var_or_name, context)
         try:
-            return reverse(self.view_name, args=args, kwargs=kwargs)
+            return reverse(view_name, args=args, kwargs=kwargs)
         except NoReverseMatch:
             try:
                 project_name = settings.SETTINGS_MODULE.split('.')[0]
-                return reverse(project_name + '.' + self.view_name, args=args, kwargs=kwargs)
+                return reverse(project_name + '.' + view_name, args=args, kwargs=kwargs)
             except NoReverseMatch:
                 return ''
 
@@ -954 +955 @@
 
     This is a way to define links that aren't tied to a particular URL configuration::
 
-        {% url path.to.some_view arg1,arg2,name1=value1 %}
+        {% url "path.to.some_view" arg1,arg2,name1=value1 %}
+        {% url path_variable arg1,arg2,name1=value1 %}
 
     The first argument is a path to a view. It can be an absolute python path
     or just ``app_name.view_name`` without the project name if the view is

tests/regressiontests/templates/tests.py

@@ -783 +783 @@
 
             ### URL TAG ########################################################
             # Successes
-            'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
-            'url02' : ('{% url regressiontests.templates.views.client_action client.id, action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
-            'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'),
-            'url04' : ('{% url named.client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),
-            'url05' : (u'{% url метка_оператора v %}', {'v': u'Ω'},
+            'url01' : ('{% url "regressiontests.templates.views.client" client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
+            'url02' : ('{% url "regressiontests.templates.views.client_action" client.id, action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url03' : ('{% url "regressiontests.templates.views.index" %}', {}, '/url_tag/'),
+            'url04' : ('{% url "named.client" client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),
+            'url05' : (u'{% url "метка_оператора" v %}', {'v': u'Ω'},
                     '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
+            'url06' : ('{% url view_path client.id %}', {'view_path': "regressiontests.templates.views.client", 'client': {'id': 1}}, '/url_tag/client/1/'),
+            'url07' : ('{% url view_path client.id, action="update" %}', {'view_path': "regressiontests.templates.views.client_action", 'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url08' : ('{% url view_path %}', {'view_path': "regressiontests.templates.views.index", }, '/url_tag/'),
+            'url09' : ('{% url view_path client.id %}', {'view_path': "named.client", 'client': {'id': 1}}, '/url_tag/named-client/1/'),
+            'url10' : (u'{% url view_path v %}', {'view_path': "метка_оператора", 'v': u'Ω'},
+                    '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
 
             # Failures
             'url-fail01' : ('{% url %}', {}, template.TemplateSyntaxError),
-            'url-fail02' : ('{% url no_such_view %}', {}, ''),
-            'url-fail03' : ('{% url regressiontests.templates.views.client no_such_param="value" %}', {}, ''),
+            'url-fail02' : ('{% url "no_such_view" %}', {}, ''),
+            'url-fail03' : ('{% url "regressiontests.templates.views.client" no_such_param="value" %}', {}, ''),
+            'url-fail04' : ('{% url view_path %}', {'view_path': "no_such_view"}, ''),
+            'url-fail05' : ('{% url view_path no_such_param="value" %}', {'view_path': "regressiontests.templates.views.client"}, ''),
         }
 
         # Register our custom template loader.

docs/templates.txt

@@ -924 +924 @@
 view function and optional parameters. This is a way to output links without
 violating the DRY principle by having to hard-code URLs in your templates::
 
-    {% url path.to.some_view arg1,arg2,name1=value1 %}
+    {% url "path.to.some_view" arg1,arg2,name1=value1 %}
+    {% url path_in_a_var arg1,arg2,name1=value1 %}
 
 The first argument is a path to a view function in the format
-``package.package.module.function``. Additional arguments are optional and
+``package.package.module.function`` (either as a string literal with quotes or 
+the name of a variable containing the path). Additional arguments are optional and
 should be comma-separated values that will be used as positional and keyword
 arguments in the URL. All arguments required by the URLconf should be present.
 
@@ -950 +952 @@
 
 **New in development version:** If you're using `named URL patterns`_,
 you can refer to the name of the pattern in the ``url`` tag instead of
-using the path to the view.
+using the path to the view. The fact that you can use a variable for the 
+path is new. Previous versions used the path directly but without the quotes,
+which means any template written using this convention will break. 
 
 .. _named URL patterns: ../url_dispatch/#naming-url-patterns