Changeset 8716

Timestamp:

08/29/08 14:28:03 (3 months ago)

Author:

jacob

Message:

Merge branch 'url-tag-asvar'

Files:

• django/trunk/django/template/defaulttags.py (modified) (3 diffs)
• django/trunk/docs/ref/templates/builtins.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/defaulttags.py

@@ -352 +352 @@
-
-class URLNode(Node):
-
+, asvar
-        self.view_name = view_name
-        self.args = args
-        self.kwargs = kwargs
+        self.asvar = asvar
-
-    def render(self, context):
@@ -362 +363 @@
-        kwargs = dict([(smart_str(k,'ascii'), v.resolve(context))
-                       for k, v in self.kwargs.items()])
+        
+        
+        # Try to look up the URL twice: once given the view name, and again
+        # relative to what we guess is the "main" app. If they both fail, 
+        # re-raise the NoReverseMatch unless we're using the 
+        # {% url ... as var %} construct in which cause return nothing.
+        url = ''
-        try:
-return
+url =
-        except NoReverseMatch:
-            project_name = settings.SETTINGS_MODULE.split('.')[0]
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-class WidthRatioNode(Node):
@@ -1042 +1060 @@
-    The URL will look like ``/clients/client/123/``.
-    """
-, 2
+
-    if len(bits) < 2:
-        raise TemplateSyntaxError("'%s' takes at least one argument"
-                                  " (path to a view)" % bits[0])
+    viewname = bits[1]
-    args = []
-    kwargs = {}
+    asvar = None
+        
-    if len(bits) > 2:
-for arg in bits[2].split(','):
-    if '=' in arg
-    k, v = arg.split('=', 1)
-k = k.strip
-kwargs[k] = parser.compile_filter(v)
+bits = iter(bits[2:])
+for bit in bits
+if bit == 'as':
+asvar = bits.next
+break
-            else:
-
-
+
+
+
+
+
+
+
+
-url = register.tag(url)
-

django/trunk/docs/ref/templates/builtins.txt

@@ -676 +676 @@
-tag instead of using the path to the view.
-
+Note that if the URL you're reversing doesn't exist, you'll get an
+:exc:`NoReverseMatch` exception raised, which will cause your site to display an
+error page.
+
+**New in development verson:** If you'd like to retrieve a URL without displaying it,
+you can use a slightly different call:
+
+.. code-block:: html+django
+
+    {% url path.to.view arg, arg2 as the_url %}
+    
+    <a href="{{ the_url }}">I'm linking to {{ the_url }}</a>
+    
+This ``{% url ... as var %}`` syntax will *not* cause an error if the view is
+missing. In practice you'll use this to link to views that are optional:
+
+.. code-block:: html+django
+
+    {% url path.to.view as the_url %}
+    {% if the_url %}
+      <a href="{{ the_url }}">Link to optional stuff</a>
+    {% endif %}
+
-.. templatetag:: widthratio
-

django/trunk/tests/regressiontests/templates/tests.py

@@ -897 +897 @@
-            'url-fail03': ('{% url regressiontests.templates.views.client %}', {}, urlresolvers.NoReverseMatch),
-
+            # {% url ... as var %}
+            'url-asvar01': ('{% url regressiontests.templates.views.index as url %}', {}, ''),
+            'url-asvar02': ('{% url regressiontests.templates.views.index as url %}{{ url }}', {}, '/url_tag/'),
+            'url-asvar03': ('{% url no_such_view as url %}{{ url }}', {}, ''),
+
-            ### CACHE TAG ######################################################
-            'cache01': ('{% load cache %}{% cache -1 test %}cache01{% endcache %}', {}, 'cache01'),