Ticket #7049: defaulttags.diff

defaulttags.py

@@ -357 +357 @@
     def render(self, context):
         from django.core.urlresolvers import reverse, NoReverseMatch
         args = [arg.resolve(context) for arg in self.args]
+        view_name = self.view_name.resolve(context)
+        if not view_name:
+            view_name = self.view_name.token
         kwargs = dict([(smart_str(k,'ascii'), v.resolve(context))
                        for k, v in self.kwargs.items()])
         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,
+                return reverse(project_name + '.' + view_name,
                                args=args, kwargs=kwargs)
             except NoReverseMatch:
                 return ''
@@ -1050 +1053 @@
                 kwargs[k] = parser.compile_filter(v)
             else:
                 args.append(parser.compile_filter(arg))
-    return URLNode(bits[1], args, kwargs)
+    return URLNode(parser.compile_filter(bits[1]), args, kwargs)
 url = register.tag(url)
 
 #@register.tag