Revision: 621
Author: batiste.bieler
Date: Mon Jul 27 13:01:49 2009
Log: Fix bug 133
http://code.google.com/p/django-page-cms/source/detail?r=621
Modified:
/trunk/pages/managers.py
/trunk/pages/models.py
/trunk/pages/tests/pages_tests.py
=======================================
--- /trunk/pages/managers.py Sun Jul 26 07:34:43 2009
+++ /trunk/pages/managers.py Mon Jul 27 13:01:49 2009
@@ -40,21 +40,6 @@
"""Return a ``QuerySet`` of pages without parent."""
return self.filter(parent__isnull=True)
- def valid_targets(self, page_id, perms="All", page=None):
- """Return a ``QuerySet`` of valid targets for moving a page into
the
- tree."""
- if page is None:
- page = self.get(pk=page_id)
- exclude_list = []
- if page:
- exclude_list.append(page.id)
- for p in page.get_descendants():
- exclude_list.append(p.id)
- if perms != "All":
- return self.filter(id__in=perms).exclude(id__in=exclude_list)
- else:
- return self.exclude(id__in=exclude_list)
-
def navigation(self):
"""Creates a ``QuerySet`` of the published root pages."""
return self.on_site().filter(
@@ -205,7 +190,7 @@
AND pages_content.body =%s)
GROUP BY pages_content.page_id'''
- cursor = connection.curr()
+ cursor = connection.cursor()
cursor.execute(sql, ('slug', slug, ))
return [c[0] for c in cursor.fetchall()]
=======================================
--- /trunk/pages/models.py Sun Jul 26 07:34:43 2009
+++ /trunk/pages/models.py Mon Jul 27 13:01:49 2009
@@ -257,6 +257,18 @@
return True
return False
+ def valid_targets(self, perms="All"):
+ """Return a ``QuerySet`` of valid targets for moving a page into
the
+ tree."""
+ exclude_list = [self.id]
+ for p in self.get_descendants():
+ exclude_list.append(p.id)
+ if perms != "All":
+ return Page.objects.filter(id__in=perms).exclude(
+ id__in=exclude_list)
+ else:
+ return Page.objects.exclude(id__in=exclude_list)
+
def with_level(self):
"""Display the slug of the page prepended with insecable
spaces equal to the level of page in the hierarchy."""
=======================================
--- /trunk/pages/tests/pages_tests.py Wed Jul 22 01:58:14 2009
+++ /trunk/pages/tests/pages_tests.py Mon Jul 27 13:01:49 2009
@@ -591,11 +591,13 @@
page_data['target'] = root_page.id
page_data['slug'] = 'child-1'
response = c.post('/admin/pages/page/add/', page_data)
+ self.assertEqual(response.status_code, 302)
c1 = Content.objects.get_content_slug_by_slug('child-1').page
- self.assertEqual(len(Page.objects.valid_targets(root_page.id)), 0)
- self.assertEqual(str(Page.objects.valid_targets(c1.id)),
- "[<Page: root>]")
+ root_page = Content.objects.get_content_slug_by_slug('root').page
+ self.assertEqual(len(root_page.valid_targets()), 0)
+ self.assertEqual(str(c1.valid_targets()),
+ "[<Page: root>]")
def test_25_page_admin_view(self):
"""Test page admin view"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
