matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve page navigation limit logic

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-07-31 01:53:35 -04:00
parent ef0843276b
commit 12f24316a1
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/views/document_page_views.py
+12 -12
View File
@@ -131,17 +131,17 @@ class DocumentPageNavigationNext(DocumentPageNavigationBase):
def get_new_kwargs(self):
document_page = self.get_object()
try:
document_page = document_page.siblings.filter(
page_number__gt=document_page.page_number
).first()
except DocumentPage.DoesNotExist:
new_document_page = document_page.siblings.filter(
page_number__gt=document_page.page_number
).first()
if new_document_page:
return {'pk': new_document_page.pk}
else:
messages.warning(
message=_(
'There are no more pages in this document'
), request=self.request
)
finally:
return {'pk': document_page.pk}
@@ -149,17 +149,17 @@ class DocumentPageNavigationPrevious(DocumentPageNavigationBase):
def get_new_kwargs(self):
document_page = self.get_object()
try:
document_page = document_page.siblings.filter(
page_number__lt=document_page.page_number
).last()
except DocumentPage.DoesNotExist:
new_document_page = document_page.siblings.filter(
page_number__lt=document_page.page_number
).last()
if new_document_page:
return {'pk': new_document_page.pk}
else:
messages.warning(
message=_(
'You are already at the first page of this document'
), request=self.request
)
finally:
return {'pk': document_page.pk}