Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.6.x] Fixed display of lists after website redesign

Browse Source 
Thanks Brian Jacobel for the report. refs django/djangoproject.com#197

Backport of c7786550c4ed396b8580db58f7da60e850894d19 from master
This commit is contained in:
Markus Holtermann 2014-12-17 14:01:19 +01:00 committed by Tim Graham
parent 3ac7d83ba5
commit b6c05b2b94
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docs/ref/templates/builtins.txt
View File

@ -810,13 +810,18 @@ This complex tag is best illustrated by way of an example: say that "places" is
...and you'd like to display a hierarchical list that is ordered by country, like this: ...and you'd like to display a hierarchical list that is ordered by country, like this:
* India * India
* Mumbai: 19,000,000
* Calcutta: 15,000,000 * Mumbai: 19,000,000
* Calcutta: 15,000,000
* USA * USA
* New York: 20,000,000
* Chicago: 7,000,000 * New York: 20,000,000
* Chicago: 7,000,000
* Japan * Japan
* Tokyo: 33,000,000
* Tokyo: 33,000,000
You can use the ``{% regroup %}`` tag to group the list of cities by country. You can use the ``{% regroup %}`` tag to group the list of cities by country.
@ -870,15 +875,24 @@ With this input for ``cities``, the example ``{% regroup %}`` template code
above would result in the following output: above would result in the following output:
* India * India
* Mumbai: 19,000,000
* Mumbai: 19,000,000
* USA * USA
* New York: 20,000,000
* New York: 20,000,000
* India * India
* Calcutta: 15,000,000
* Calcutta: 15,000,000
* USA * USA
* Chicago: 7,000,000
* Chicago: 7,000,000
* Japan * Japan
* Tokyo: 33,000,000
* Tokyo: 33,000,000
The easiest solution to this gotcha is to make sure in your view code that the The easiest solution to this gotcha is to make sure in your view code that the
data is ordered according to how you want to display it. data is ordered according to how you want to display it.

10
docs/releases/1.6.txt
View File

@ -838,11 +838,11 @@ Object Relational Mapper changes
Django 1.6 contains many changes to the ORM. These changes fall mostly in Django 1.6 contains many changes to the ORM. These changes fall mostly in
three categories: three categories:
1. Bug fixes (e.g. proper join clauses for generic relations, query 1. Bug fixes (e.g. proper join clauses for generic relations, query combining,
combining, join promotion, and join trimming fixes) join promotion, and join trimming fixes)
2. Preparation for new features. For example the ORM is now internally ready 2. Preparation for new features. For example the ORM is now internally ready
for multicolumn foreign keys. for multicolumn foreign keys.
3. General cleanup. 3. General cleanup.
These changes can result in some compatibility problems. For example, some These changes can result in some compatibility problems. For example, some
queries will now generate different table aliases. This can affect queries will now generate different table aliases. This can affect