From 482388cd61ee97d8898097fb6777c5d7ca4216af Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Sun, 25 Sep 2011 05:21:29 +0000 Subject: [PATCH] Fixed #16927 -- Corrected the `{% ifchanged %}` template tag's documentation. Thanks to sebastian for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16902 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaulttags.py | 9 +++++---- docs/ref/templates/builtins.txt | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 125cd9ed55..0b039a5e00 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -936,7 +936,8 @@ def ifchanged(parser, token): """ Checks if a value has changed from the last iteration of a loop. - The 'ifchanged' block tag is used within a loop. It has two possible uses. + The ``{% ifchanged %}`` block tag is used within a loop. It has two + possible uses. 1. Checks its own rendered contents against its previous state and only displays the content if it has changed. For example, this displays a @@ -949,9 +950,9 @@ def ifchanged(parser, token): {{ date|date:"j" }} {% endfor %} - 2. If given a variable, check whether that variable has changed. - For example, the following shows the date every time it changes, but - only shows the hour if both the hour and the date have changed:: + 2. If given one or more variables, check whether any variable has changed. + For example, the following shows the date every time it changes, while + showing the hour if either the hour or the date has changed:: {% for date in days %} {% ifchanged date.date %} {{ date.date }} {% endifchanged %} diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 3638ce9078..6850f0504f 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -555,7 +555,8 @@ ifchanged Check if a value has changed from the last iteration of a loop. -The 'ifchanged' block tag is used within a loop. It has two possible uses. +The ``{% ifchanged %}`` block tag is used within a loop. It has two possible +uses. 1. Checks its own rendered contents against its previous state and only displays the content if it has changed. For example, this displays a list of @@ -568,9 +569,9 @@ The 'ifchanged' block tag is used within a loop. It has two possible uses. {{ date|date:"j" }} {% endfor %} -2. If given a variable, check whether that variable has changed. For - example, the following shows the date every time it changes, but - only shows the hour if both the hour and the date has changed:: +2. If given one or more variables, check whether any variable has changed. + For example, the following shows the date every time it changes, while + showing the hour if either the hour or the date has changed:: {% for date in days %} {% ifchanged date.date %} {{ date.date }} {% endifchanged %}