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

Backport document page view improvements

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-07 15:27:46 -04:00
parent 28114264c1
commit 8e5b60e1c0
5 changed files with 136 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mayan/apps/documents/models/document_page_models.py
View File

@@ -54,13 +54,7 @@ class DocumentPage(models.Model):
verbose_name_plural = _('Document pages')
def __str__(self):
return _(
'Page %(page_num)d out of %(total_pages)d of %(document)s'
) % {
'document': force_text(self.document),
'page_num': self.page_number,
'total_pages': self.document_version.pages.count()
}
return self.get_label()
@property
def cache_filename(self):
@@ -111,7 +105,9 @@ class DocumentPage(models.Model):
return cache_filename
def get_absolute_url(self):
return reverse('documents:document_page_view', args=(self.pk,))
return reverse(
viewname='documents:document_page_view', kwargs={'pk': self.pk}
)
def get_api_image_url(self, *args, **kwargs):
"""
@@ -240,6 +236,16 @@ class DocumentPage(models.Model):
def is_in_trash(self):
return self.document.is_in_trash
def get_label(self):
return _(
'Page %(page_num)d out of %(total_pages)d of %(document)s'
) % {
'document': force_text(self.document),
'page_num': self.page_number,
'total_pages': self.document_version.pages.count()
}
get_label.short_description = _('Label')
def natural_key(self):
return (self.page_number, self.document_version.natural_key())
natural_key.dependencies = ['documents.DocumentVersion']