Changeset 1592

Timestamp:

05/26/08 12:47:58 (22 months ago)

Author:

JensDiemer

Message:

Bugfix tryout 2: http://www.pylucid.org/phpBB2/viewtopic.php?t=223

Location:

trunk/pylucid

Files:

• PyLucid/db/page.py (modified) (4 diffs)
• tests/__init__.py (modified) (1 diff)

trunk/pylucid/PyLucid/db/page.py

@@ -6 +6 @@
 
     some needfull functions around the cms page navigation tree.
+
+    TODO: This stuff shoud be went into ./PyLucid/models/Page.py
 
     Last commit info:
@@ -64 +66 @@
     page_data = Page.objects.values(
         "id", "parent", "name", "title", "shortcut"
-    ).order_by("position")
+    ).order_by("position", "name", "id")
     tree = TreeGenerator(page_data)
     tree.activate_all()
@@ -88 +90 @@
     page_data = Page.objects.values(
         "id", "parent", "name", "title", "shortcut"
-    ).filter(showlinks = True).order_by("position")
+    ).filter(showlinks = True).order_by("position", "name", "id")
 
     if request.user.is_anonymous():
@@ -126 +128 @@
     sub_pages = Page.objects.all().filter(
         parent = current_page_id, showlinks = True
-    ).order_by('position')
+    ).order_by("position", "name", "id")
 
     if request.user.is_anonymous():

trunk/pylucid/tests/__init__.py

@@ -344 +344 @@
         shared method for create_link_snapshot() and link_snapshot_test()
         """
-        for page in sorted(Page.objects.all()):
+        for page in Page.objects.all().order_by("position", "name", "id"):
             url = page.get_absolute_url()