From bbf3ede2e6b1b4813ab02047b9d386c0b0cb6154 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 10 May 2019 00:44:47 -0400 Subject: [PATCH] Reference the external object directly This object is placed in the view context by the mixin automatically. Signed-off-by: Roberto Rosario --- mayan/apps/document_states/views/workflow_views.py | 10 +++++----- mayan/apps/documents/views/document_page_views.py | 6 +++--- mayan/apps/documents/views/document_type_views.py | 4 ++-- mayan/apps/documents/views/document_version_views.py | 4 ++-- mayan/apps/tags/views.py | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mayan/apps/document_states/views/workflow_views.py b/mayan/apps/document_states/views/workflow_views.py index 867fbf405c..d5c2396b36 100644 --- a/mayan/apps/document_states/views/workflow_views.py +++ b/mayan/apps/document_states/views/workflow_views.py @@ -430,7 +430,7 @@ class SetupWorkflowStateCreateView(ExternalObjectMixin, SingleObjectCreateView): ) def get_workflow(self): - return self.get_external_object() + return self.external_object class SetupWorkflowStateDeleteView(SingleObjectDeleteView): @@ -501,7 +501,7 @@ class SetupWorkflowStateListView(ExternalObjectMixin, SingleObjectListView): return self.get_workflow().states.all() def get_workflow(self): - return self.get_external_object() + return self.external_object # Transitions @@ -541,7 +541,7 @@ class SetupWorkflowTransitionCreateView(ExternalObjectMixin, SingleObjectCreateV ) def get_workflow(self): - return self.get_external_object() + return self.external_object class SetupWorkflowTransitionDeleteView(SingleObjectDeleteView): @@ -622,7 +622,7 @@ class SetupWorkflowTransitionListView(ExternalObjectMixin, SingleObjectListView) return self.get_workflow().transitions.all() def get_workflow(self): - return self.get_external_object() + return self.external_object class SetupWorkflowTransitionTriggerEventListView(ExternalObjectMixin, FormView): @@ -660,7 +660,7 @@ class SetupWorkflowTransitionTriggerEventListView(ExternalObjectMixin, FormView) ).form_valid(form=form) def get_object(self): - return self.get_external_object() + return self.external_object def get_extra_context(self): return { diff --git a/mayan/apps/documents/views/document_page_views.py b/mayan/apps/documents/views/document_page_views.py index 7586f5793b..69b17871f6 100644 --- a/mayan/apps/documents/views/document_page_views.py +++ b/mayan/apps/documents/views/document_page_views.py @@ -58,7 +58,7 @@ class DocumentPageNavigationBase(ExternalObjectMixin, RedirectView): external_object_pk_url_kwarg = 'pk' def get_object(self): - return self.get_external_object() + return self.external_object def get_redirect_url(self, *args, **kwargs): """ @@ -180,7 +180,7 @@ class DocumentPageView(ExternalObjectMixin, SimpleView): } def get_object(self): - return self.get_external_object() + return self.external_object class DocumentPageViewResetView(RedirectView): @@ -193,7 +193,7 @@ class DocumentPageInteractiveTransformation(ExternalObjectMixin, RedirectView): external_object_pk_url_kwarg = 'pk' def get_object(self): - return self.get_external_object() + return self.external_object def get_redirect_url(self, *args, **kwargs): query_dict = { diff --git a/mayan/apps/documents/views/document_type_views.py b/mayan/apps/documents/views/document_type_views.py index 2f1b7861f2..b9e26a918a 100644 --- a/mayan/apps/documents/views/document_type_views.py +++ b/mayan/apps/documents/views/document_type_views.py @@ -140,7 +140,7 @@ class DocumentTypeFilenameCreateView(ExternalObjectMixin, SingleObjectCreateView form_class = DocumentTypeFilenameForm_create def get_document_type(self): - return self.get_external_object() + return self.external_object def get_extra_context(self): return { @@ -216,7 +216,7 @@ class DocumentTypeFilenameListView(ExternalObjectMixin, SingleObjectListView): external_object_pk_url_kwarg = 'pk' def get_document_type(self): - return self.get_external_object() + return self.external_object def get_extra_context(self): return { diff --git a/mayan/apps/documents/views/document_version_views.py b/mayan/apps/documents/views/document_version_views.py index 9dfd26793e..4c53bbff36 100644 --- a/mayan/apps/documents/views/document_version_views.py +++ b/mayan/apps/documents/views/document_version_views.py @@ -93,7 +93,7 @@ class DocumentVersionListView(ExternalObjectMixin, SingleObjectListView): external_object_pk_url_kwarg = 'pk' def get_document(self): - document = self.get_external_object() + document = self.external_object document.add_as_recent_document_for_user(user=self.request.user) return document @@ -125,7 +125,7 @@ class DocumentVersionRevertView(ExternalObjectMixin, ConfirmView): } def get_object(self): - return self.get_external_object() + return self.external_object def view_action(self): try: diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 974c41eec1..2dc0d5d902 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -248,7 +248,7 @@ class TagDocumentListView(ExternalObjectMixin, DocumentListView): return context def get_tag(self): - return self.get_external_object() + return self.external_object class DocumentTagListView(ExternalObjectMixin, TagListView): @@ -263,20 +263,20 @@ class DocumentTagListView(ExternalObjectMixin, TagListView): 'hide_link': True, 'no_results_main_link': link_document_tag_multiple_attach.resolve( context=RequestContext( - self.request, {'object': self.get_external_object()} + self.request, {'object': self.external_object} ) ), 'no_results_title': _('Document has no tags attached'), - 'object': self.get_external_object(), + 'object': self.external_object, 'title': _( 'Tags for document: %s' - ) % self.get_external_object(), + ) % self.external_object, } ) return context def get_source_queryset(self): - return self.get_external_object().get_tags( + return self.external_object.get_tags( permission=permission_tag_view, user=self.request.user ).all()