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

Document: Rename DocumentPageResult model

Browse Source 
Rename the DocumentPageResult to DocumentPageSearchResult for
clarity of purpose.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-12-05 02:48:34 -04:00
parent f9dfc00b30
commit 2d4a710999
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/appearance/templates/appearance/home.html
View File

@@ -44,7 +44,7 @@
<div class="well center-block">
<div class="row">
<div class="col-xs-12">
<form action="{% url 'search:results' search_model='documents.DocumentPageResult' %}" method="get" role="search">
<form action="{% url 'search:results' search_model='documents.DocumentPageSearchResult' %}" method="get" role="search">
<div class="input-group">
<input class="form-control" name="q" placeholder="{% trans 'Search pages' %}" type="text" value="{{ search_terms|default:'' }}">
<span class="input-group-btn">

8
mayan/apps/documents/apps.py
View File

@@ -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'
)

2
mayan/apps/documents/models.py
View File

@@ -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

2
mayan/apps/documents/search.py
View File

@@ -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'
)

6
mayan/apps/metadata/apps.py
View File

@@ -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
)

6
mayan/apps/tags/apps.py
View File

@@ -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