0.5.18 fix next \ prev doc
This commit is contained in:
@@ -71,12 +71,15 @@ class DocArt(BaseModelViewPage):
|
|||||||
if not version:
|
if not version:
|
||||||
version = self.get_last_version()
|
version = self.get_last_version()
|
||||||
|
|
||||||
art = DocArt.objects.filter(
|
kwargs = {
|
||||||
enable=True,
|
'enable': True,
|
||||||
versions=version,
|
'versions': version,
|
||||||
order__lt=self.order,
|
'parent': self.parent
|
||||||
parent=self.parent
|
}
|
||||||
).order_by('-order').first()
|
if self.order:
|
||||||
|
kwargs['order__lt'] = self.order
|
||||||
|
|
||||||
|
art = DocArt.objects.filter(**kwargs).order_by('-order').first()
|
||||||
|
|
||||||
if art:
|
if art:
|
||||||
while art.get_last_child(version=version):
|
while art.get_last_child(version=version):
|
||||||
@@ -94,12 +97,16 @@ class DocArt(BaseModelViewPage):
|
|||||||
|
|
||||||
art = self.get_first_child(version=version)
|
art = self.get_first_child(version=version)
|
||||||
if not art:
|
if not art:
|
||||||
art = DocArt.objects.filter(
|
|
||||||
enable=True,
|
kwargs = {
|
||||||
versions=version,
|
'enable': True,
|
||||||
order__gt=self.order,
|
'versions': version,
|
||||||
parent=self.parent
|
'parent': self.parent
|
||||||
).order_by('order').first()
|
}
|
||||||
|
if self.order:
|
||||||
|
kwargs['order__gt'] = self.order
|
||||||
|
|
||||||
|
art = DocArt.objects.filter(**kwargs).order_by('order').first()
|
||||||
|
|
||||||
if not art and self.parent:
|
if not art and self.parent:
|
||||||
art = DocArt.objects.filter(
|
art = DocArt.objects.filter(
|
||||||
|
|||||||
Reference in New Issue
Block a user