Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-19 14:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #191 from kaedroho/page-changes

Browse source 
Override a few treebeard methods to add inclusive flag
This commit is contained in:
Karl Hobley 2014-04-08 17:03:17 +01:00
commit a3d58126fd
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wagtail/wagtailcore/models.py
View file

@ -558,6 +558,15 @@ class Page(MP_Node, ClusterableModel, Indexed):
user_perms = UserPagePermissionsProxy(user)
return user_perms.for_page(self)
def get_ancestors(self, inclusive=False):
return Page.objects.ancestor_of(self, inclusive)
def get_descendants(self, inclusive=False):
return Page.objects.descendant_of(self, inclusive)
def get_siblings(self, inclusive=True):
return Page.objects.sibling_of(self, inclusive)
def get_navigation_menu_items():
# Get all pages that appear in the navigation menu: ones which have children,

6
wagtail/wagtailcore/query.py
View file

@ -84,7 +84,7 @@ class PageQuerySet(MP_NodeQuerySet):
def not_parent_of(self, other):
return self.exclude(self.parent_of_q(other))
def sibling_of_q(self, other, inclusive=False):
def sibling_of_q(self, other, inclusive=True):
q = Q(path__startswith=self.model._get_parent_path_from_path(other.path)) & Q(depth=other.depth)
if not inclusive:
@ -92,10 +92,10 @@ class PageQuerySet(MP_NodeQuerySet):
return q
def sibling_of(self, other, inclusive=False):
def sibling_of(self, other, inclusive=True):
return self.filter(self.sibling_of_q(other, inclusive))
def not_sibling_of(self, other, inclusive=False):
def not_sibling_of(self, other, inclusive=True):
return self.exclude(self.sibling_of_q(other, inclusive))
def type_q(self, model):