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

Refactor the model accesors

Browse Source 
Refactor the accesors to behave like methods instead of properties.
This means all accesors will be prepended with the string
"get_" and will include a set of parenthesis.

Improve the ModeAttribute class to use the method's
short_description. This commit also adds support for a
new method .help_text attribute has been added.

Move accessors to their own module, named "methods.py".

Remove the PropertyHelper class as the accessors no longer
need it.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-15 04:49:40 -04:00
parent 8c63ef4c69
commit 0e86f2ad8a
42 changed files with 434 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/ocr/tests/literals.py
+1 -1
View File
@@ -1,4 +1,4 @@
from __future__ import unicode_literals
TEST_OCR_INDEX_NODE_TEMPLATE = '{% if "mayan" in document.ocr_content.lower() %}mayan{% endif %}'
TEST_OCR_INDEX_NODE_TEMPLATE = '{% if "mayan" in document.get_ocr_content().lower() %}mayan{% endif %}'
TEST_OCR_INDEX_NODE_TEMPLATE_LEVEL = 'mayan'
mayan/apps/ocr/tests/test_views.py
+6 -6
View File
@@ -82,7 +82,7 @@ class OCRViewsTestCase(GenericDocumentViewTestCase):
)
self._request_document_submit_view()
self.assertTrue(
TEST_DOCUMENT_CONTENT in self.document.ocr_content
TEST_DOCUMENT_CONTENT in self.document.get_ocr_content()
)
def _request_multiple_document_submit_view(self):
@@ -95,7 +95,7 @@ class OCRViewsTestCase(GenericDocumentViewTestCase):
def test_multiple_document_submit_view_no_permission(self):
self._request_multiple_document_submit_view()
self.assertEqual(self.document.ocr_content, '')
self.assertEqual(self.document.get_ocr_content(), '')
def test_multiple_document_submit_view_with_access(self):
self.grant_access(
@@ -103,7 +103,7 @@ class OCRViewsTestCase(GenericDocumentViewTestCase):
)
self._request_multiple_document_submit_view()
self.assertTrue(
TEST_DOCUMENT_CONTENT in self.document.ocr_content
TEST_DOCUMENT_CONTENT in self.document.get_ocr_content()
)
def _request_document_ocr_download_view(self):
@@ -126,7 +126,7 @@ class OCRViewsTestCase(GenericDocumentViewTestCase):
self.assertEqual(response.status_code, 200)
self.assert_download_response(
response=response, content=self.document.ocr_content
response=response, content=self.document.get_ocr_content()
)
@@ -169,7 +169,7 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase):
response = self._request_document_type_submit_view()
self.assertEqual(response.status_code, 200)
self.assertTrue(
TEST_DOCUMENT_CONTENT not in self.document.ocr_content
TEST_DOCUMENT_CONTENT not in self.document.get_ocr_content()
)
def test_document_type_submit_view_with_access(self):
@@ -179,5 +179,5 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase):
response = self._request_document_type_submit_view()
self.assertEqual(response.status_code, 302)
self.assertTrue(
TEST_DOCUMENT_CONTENT in self.document.ocr_content
TEST_DOCUMENT_CONTENT in self.document.get_ocr_content()
)