Commit b6c05b2b authored by Markus Holtermann's avatar Markus Holtermann Committed by Tim Graham
Browse files

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

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

Backport of c7786550 from master
parent 3ac7d83b

docs/ref/templates/builtins.txt

+24 −10
Original line number Diff line number Diff line
@@ -810,12 +810,17 @@ 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:



* India



  * Mumbai: 19,000,000

  * Calcutta: 15,000,000



* USA



  * New York: 20,000,000

  * Chicago: 7,000,000



* Japan



  * Tokyo: 33,000,000
@@ -870,14 +875,23 @@ With this input for ``cities``, the example ``{% regroup %}`` template code 
above would result in the following output:



* India



  * Mumbai: 19,000,000



* USA



  * New York: 20,000,000



* India



  * Calcutta: 15,000,000



* USA



  * Chicago: 7,000,000



* Japan



  * Tokyo: 33,000,000



The easiest solution to this gotcha is to make sure in your view code that the

docs/releases/1.6.txt

+5 −5
Original line number Diff line number Diff line
@@ -838,8 +838,8 @@ Object Relational Mapper changes 
Django 1.6 contains many changes to the ORM. These changes fall mostly in

three categories:



  1. Bug fixes (e.g. proper join clauses for generic relations, query

     combining, join promotion, and join trimming fixes)

1. Bug fixes (e.g. proper join clauses for generic relations, query combining,

   join promotion, and join trimming fixes)

2. Preparation for new features. For example the ORM is now internally ready

   for multicolumn foreign keys.

3. General cleanup.