From 2d4a710999da93be497cd830c86d9c808be30892 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 5 Dec 2018 02:48:34 -0400 Subject: [PATCH] Document: Rename DocumentPageResult model Rename the DocumentPageResult to DocumentPageSearchResult for clarity of purpose. Signed-off-by: Roberto Rosario --- mayan/apps/appearance/templates/appearance/home.html | 2 +- mayan/apps/documents/apps.py | 8 ++++---- mayan/apps/documents/models.py | 2 +- mayan/apps/documents/search.py | 2 +- mayan/apps/metadata/apps.py | 6 +++--- mayan/apps/tags/apps.py | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html index 4a6bdd4c11..273cf9ea12 100644 --- a/mayan/apps/appearance/templates/appearance/home.html +++ b/mayan/apps/appearance/templates/appearance/home.html @@ -44,7 +44,7 @@
-
+
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index e5906e61ac..ee37593aff 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -124,7 +124,7 @@ class DocumentsApp(MayanAppConfig): DeletedDocument = self.get_model('DeletedDocument') Document = self.get_model('Document') DocumentPage = self.get_model('DocumentPage') - DocumentPageResult = self.get_model('DocumentPageResult') + DocumentPageSearchResult = self.get_model('DocumentPageSearchResult') DocumentType = self.get_model('DocumentType') DocumentTypeFilename = self.get_model('DocumentTypeFilename') DocumentVersion = self.get_model('DocumentVersion') @@ -217,7 +217,7 @@ class DocumentsApp(MayanAppConfig): model=DocumentPage, related='document_version__document', ) ModelPermission.register_inheritance( - model=DocumentPageResult, related='document_version__document', + model=DocumentPageSearchResult, related='document_version__document', ) ModelPermission.register_inheritance( model=DocumentTypeFilename, related='document_type', @@ -260,14 +260,14 @@ class DocumentsApp(MayanAppConfig): ) SourceColumn( - source=DocumentPageResult, label=_('Thumbnail'), + source=DocumentPageSearchResult, label=_('Thumbnail'), func=lambda context: document_page_thumbnail_widget.render( instance=context['object'] ) ) SourceColumn( - source=DocumentPageResult, label=_('Type'), + source=DocumentPageSearchResult, label=_('Type'), attribute='document_version.document.document_type' ) diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 76a80c4fae..812a55ba63 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -971,7 +971,7 @@ class DocumentPage(models.Model): return '{}-{}'.format(self.document_version.uuid, self.pk) -class DocumentPageResult(DocumentPage): +class DocumentPageSearchResult(DocumentPage): class Meta: ordering = ('document_version__document', 'page_number') proxy = True diff --git a/mayan/apps/documents/search.py b/mayan/apps/documents/search.py index e418c7d48a..d8dfe7d53a 100644 --- a/mayan/apps/documents/search.py +++ b/mayan/apps/documents/search.py @@ -25,7 +25,7 @@ document_search.add_model_field( ) document_page_search = SearchModel( - app_label='documents', model_name='DocumentPageResult', + app_label='documents', model_name='DocumentPageSearchResult', permission=permission_document_view, serializer_string='mayan.apps.documents.serializers.DocumentPageSerializer' ) diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index 05da7202a9..c8fe69daa6 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -77,8 +77,8 @@ class MetadataApp(MayanAppConfig): Document = apps.get_model( app_label='documents', model_name='Document' ) - DocumentPageResult = apps.get_model( - app_label='documents', model_name='DocumentPageResult' + DocumentPageSearchResult = apps.get_model( + app_label='documents', model_name='DocumentPageSearchResult' ) DocumentType = apps.get_model( @@ -154,7 +154,7 @@ class MetadataApp(MayanAppConfig): ) SourceColumn( - source=DocumentPageResult, label=_('Metadata'), + source=DocumentPageSearchResult, label=_('Metadata'), func=lambda context: get_metadata_string( context['object'].document ) diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py index 7ee7917ec5..ae814e02fd 100644 --- a/mayan/apps/tags/apps.py +++ b/mayan/apps/tags/apps.py @@ -58,8 +58,8 @@ class TagsApp(MayanAppConfig): app_label='documents', model_name='Document' ) - DocumentPageResult = apps.get_model( - app_label='documents', model_name='DocumentPageResult' + DocumentPageSearchResult = apps.get_model( + app_label='documents', model_name='DocumentPageSearchResult' ) DocumentTag = self.get_model('DocumentTag') @@ -115,7 +115,7 @@ class TagsApp(MayanAppConfig): ) SourceColumn( - source=DocumentPageResult, label=_('Tags'), + source=DocumentPageSearchResult, label=_('Tags'), func=lambda context: widget_document_tags( document=context['object'].document, user=context['request'].user