diff --git a/mayan/apps/acls/classes.py b/mayan/apps/acls/classes.py index 499571a8d6..21f66e95a0 100644 --- a/mayan/apps/acls/classes.py +++ b/mayan/apps/acls/classes.py @@ -24,7 +24,7 @@ class ModelPermission(object): app_label='acls', model_name='AccessControlList' ) - model.add_to_class('acls', GenericRelation(AccessControlList)) + model.add_to_class(name='acls', value=GenericRelation(AccessControlList)) @classmethod def get_classes(cls, as_content_type=False): diff --git a/mayan/apps/cabinets/apps.py b/mayan/apps/cabinets/apps.py index b296e92cbd..65000ac672 100644 --- a/mayan/apps/cabinets/apps.py +++ b/mayan/apps/cabinets/apps.py @@ -53,8 +53,8 @@ class CabinetsApp(MayanAppConfig): # Add explicit order_by as DocumentCabinet ordering Meta option has no # effect. Document.add_to_class( - 'document_cabinets', - lambda document: DocumentCabinet.objects.filter(documents=document).order_by('parent__label', 'label') + name='document_cabinets', + value=lambda document: DocumentCabinet.objects.filter(documents=document).order_by('parent__label', 'label') ) ModelPermission.register( diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py index eb5be40c57..5ed7ac6968 100644 --- a/mayan/apps/checkouts/apps.py +++ b/mayan/apps/checkouts/apps.py @@ -57,24 +57,24 @@ class CheckoutsApp(MayanAppConfig): DocumentCheckout = self.get_model('DocumentCheckout') Document.add_to_class( - 'check_in', - lambda document, user=None: DocumentCheckout.objects.check_in_document(document, user) + name='check_in', + value=lambda document, user=None: DocumentCheckout.objects.check_in_document(document, user) ) Document.add_to_class( - 'checkout_info', - lambda document: DocumentCheckout.objects.document_checkout_info( + name='checkout_info', + value=lambda document: DocumentCheckout.objects.document_checkout_info( document ) ) Document.add_to_class( - 'checkout_state', - lambda document: DocumentCheckout.objects.document_checkout_state( + name='checkout_state', + value=lambda document: DocumentCheckout.objects.document_checkout_state( document ) ) Document.add_to_class( - 'is_checked_out', - lambda document: DocumentCheckout.objects.is_document_checked_out( + name='is_checked_out', + value=lambda document: DocumentCheckout.objects.is_document_checked_out( document ) ) diff --git a/mayan/apps/common/managers.py b/mayan/apps/common/managers.py index 9dbcbe97d4..942b7c7e7d 100644 --- a/mayan/apps/common/managers.py +++ b/mayan/apps/common/managers.py @@ -11,7 +11,9 @@ class ErrorLogEntryManager(models.Manager): ErrorLogEntry = apps.get_model( app_label='common', model_name='ErrorLogEntry' ) - model.add_to_class('error_logs', GenericRelation(ErrorLogEntry)) + model.add_to_class( + name='error_logs', value=GenericRelation(ErrorLogEntry) + ) class UserLocaleProfileManager(models.Manager): diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py index 10829c5e7f..338f9cafd1 100644 --- a/mayan/apps/document_parsing/apps.py +++ b/mayan/apps/document_parsing/apps.py @@ -95,15 +95,17 @@ class DocumentParsingApp(MayanAppConfig): model_name='DocumentVersionParseError' ) - Document.add_to_class('submit_for_parsing', document_parsing_submit) Document.add_to_class( - 'content', document_property_content + name='submit_for_parsing', value=document_parsing_submit + ) + Document.add_to_class( + name='content', value=document_property_content ) DocumentVersion.add_to_class( - 'content', get_document_content + name='content', value=get_document_content ) DocumentVersion.add_to_class( - 'submit_for_parsing', document_version_parsing_submit + name='submit_for_parsing', value=document_version_parsing_submit ) ModelAttribute( diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py index 1895341fb6..933a24ff89 100644 --- a/mayan/apps/document_states/apps.py +++ b/mayan/apps/document_states/apps.py @@ -84,7 +84,7 @@ class DocumentStatesApp(MayanAppConfig): ) Document.add_to_class( - 'workflow', DocumentStateHelper.constructor + name='workflow', value=DocumentStateHelper.constructor ) ErrorLogEntry.objects.register(model=WorkflowStateAction) diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index 097403a8ce..43ec115770 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -2,12 +2,12 @@ from __future__ import absolute_import, unicode_literals import logging -from kombu import Exchange, Queue - from django.apps import apps from django.db.models.signals import post_delete, post_save from django.utils.translation import ugettext_lazy as _ +from kombu import Exchange, Queue + from mayan.apps.acls import ModelPermission from mayan.apps.acls.links import link_acl_list from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view @@ -90,7 +90,8 @@ class MetadataApp(MayanAppConfig): MetadataType = self.get_model('MetadataType') Document.add_to_class( - 'metadata_value_of', DocumentMetadataHelper.constructor + name='metadata_value_of', + value=DocumentMetadataHelper.constructor ) ModelAttribute( diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 3bed51bcda..cd4dce2797 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -95,12 +95,13 @@ class OCRApp(MayanAppConfig): DocumentVersionOCRError = self.get_model('DocumentVersionOCRError') - Document.add_to_class('submit_for_ocr', document_ocr_submit) Document.add_to_class( - 'ocr_content', document_property_ocr_content + name='submit_for_ocr', value=document_ocr_submit) + Document.add_to_class( + name='ocr_content', value=document_property_ocr_content ) DocumentVersion.add_to_class( - 'submit_for_ocr', document_version_ocr_submit + name='submit_for_ocr', value=document_version_ocr_submit ) ModelAttribute( diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py index ae814e02fd..0992a985ee 100644 --- a/mayan/apps/tags/apps.py +++ b/mayan/apps/tags/apps.py @@ -66,8 +66,8 @@ class TagsApp(MayanAppConfig): Tag = self.get_model('Tag') Document.add_to_class( - 'attached_tags', - lambda document: DocumentTag.objects.filter(documents=document) + name='attached_tags', + value=lambda document: DocumentTag.objects.filter(documents=document) ) ModelEventType.register(