From 561b56b12af0057315a983c06de07e8aa35d291b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 15 Aug 2015 03:02:02 -0400 Subject: [PATCH] Replace usage of get_context_data with get_extra_context. --- mayan/apps/acls/views.py | 13 +- mayan/apps/document_indexing/views.py | 11 +- mayan/apps/document_states/views.py | 248 +++++++++----------------- mayan/apps/linking/views.py | 13 +- mayan/apps/metadata/views.py | 42 ++--- mayan/apps/ocr/views.py | 20 +-- 6 files changed, 116 insertions(+), 231 deletions(-) diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 81de6c0f41..c70b68da34 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -147,15 +147,10 @@ class ACLDeleteView(SingleObjectDeleteView): return super(ACLDeleteView, self).dispatch(request, *args, **kwargs) - def get_context_data(self, **kwargs): - context = super(ACLDeleteView, self).get_context_data(**kwargs) - context.update( - { - 'object': self.get_object().content_object, - } - ) - - return context + def get_extra_context(self): + return { + 'object': self.get_object().content_object, + } class ACLPermissionsView(AssignRemoveView): diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index bd3515ee1a..5ee33dff18 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -150,16 +150,11 @@ class SetupIndexDocumentTypesView(AssignRemoveView): def remove(self, item): self.get_object().document_types.remove(item) - def get_context_data(self, **kwargs): - data = super( - SetupIndexDocumentTypesView, self - ).get_context_data(**kwargs) - data.update({ + def get_extra_context(self): + return { 'object': self.get_object(), 'title': _('Document types linked to index: %s') % self.get_object() - }) - - return data + } # Node views diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index ab9f984e2c..c5292b3874 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -49,25 +49,18 @@ class DocumentWorkflowInstanceListView(SingleObjectListView): def get_document(self): return get_object_or_404(Document, pk=self.kwargs['pk']) + def get_extra_context(self): + return { + 'hide_link': True, + 'object': self.get_document(), + 'title': _( + 'Workflows for document: %s' + ) % self.get_document(), + } + def get_queryset(self): return self.get_document().workflows.all() - def get_context_data(self, **kwargs): - context = super( - DocumentWorkflowInstanceListView, self - ).get_context_data(**kwargs) - context.update( - { - 'hide_link': True, - 'object': self.get_document(), - 'title': _( - 'Workflows for document: %s' - ) % self.get_document(), - } - ) - - return context - class WorkflowDocumentListView(DocumentListView): def dispatch(self, request, *args, **kwargs): @@ -162,36 +155,28 @@ class WorkflowInstanceTransitionView(FormView): ) return HttpResponseRedirect(self.get_success_url()) + def get_extra_context(self): + return { + 'navigation_object_list': ('object', 'workflow_instance'), + 'object': self.get_workflow_instance().document, + 'submit_label': _('Submit'), + 'title': _( + 'Do transition for workflow: %s' + ) % self.get_workflow_instance(), + 'workflow_instance': self.get_workflow_instance(), + } + def get_form_kwargs(self): kwargs = super(WorkflowInstanceTransitionView, self).get_form_kwargs() kwargs['workflow'] = self.get_workflow_instance() return kwargs - def get_workflow_instance(self): - return get_object_or_404(WorkflowInstance, pk=self.kwargs['pk']) - - def get_context_data(self, **kwargs): - context = super( - WorkflowInstanceTransitionView, self - ).get_context_data(**kwargs) - - context.update( - { - 'navigation_object_list': ('object', 'workflow_instance'), - 'object': self.get_workflow_instance().document, - 'submit_label': _('Submit'), - 'title': _( - 'Do transition for workflow: %s' - ) % self.get_workflow_instance(), - 'workflow_instance': self.get_workflow_instance(), - } - ) - - return context - def get_success_url(self): return self.get_workflow_instance().get_absolute_url() + def get_workflow_instance(self): + return get_object_or_404(WorkflowInstance, pk=self.kwargs['pk']) + # Setup @@ -235,6 +220,14 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView): # TODO: add task launching this workflow for all the document types # of item + def get_extra_context(self): + return { + 'title': _( + 'Document types assigned the workflow: %s' + ) % self.get_object(), + 'object': self.get_object(), + } + def get_object(self): return get_object_or_404(Workflow, pk=self.kwargs['pk']) @@ -253,19 +246,6 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView): # TODO: add task deleting this workflow for all the document types of # item - def get_context_data(self, **kwargs): - data = super( - SetupWorkflowDocumentTypesView, self - ).get_context_data(**kwargs) - data.update({ - 'title': _( - 'Document types assigned the workflow: %s' - ) % self.get_object(), - 'object': self.get_object(), - }) - - return data - class SetupWorkflowStateListView(SingleObjectListView): def dispatch(self, request, *args, **kwargs): @@ -282,25 +262,18 @@ class SetupWorkflowStateListView(SingleObjectListView): SetupWorkflowStateListView, self ).dispatch(request, *args, **kwargs) - def get_workflow(self): - return get_object_or_404(Workflow, pk=self.kwargs['pk']) + def get_extra_context(self): + return { + 'hide_link': True, + 'object': self.get_workflow(), + 'title': _('States of workflow: %s') % self.get_workflow() + } def get_queryset(self): return self.get_workflow().states.all() - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowStateListView, self - ).get_context_data(**kwargs) - context.update( - { - 'hide_link': True, - 'object': self.get_workflow(), - 'title': _('States of workflow: %s') % self.get_workflow() - } - ) - - return context + def get_workflow(self): + return get_object_or_404(Workflow, pk=self.kwargs['pk']) class SetupWorkflowStateCreateView(SingleObjectCreateView): @@ -320,19 +293,13 @@ class SetupWorkflowStateCreateView(SingleObjectCreateView): SetupWorkflowStateCreateView, self ).dispatch(request, *args, **kwargs) - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowStateCreateView, self - ).get_context_data(**kwargs) - context.update( - { - 'object': self.get_workflow(), - 'title': _( - 'Create states for workflow: %s' - ) % self.get_workflow() - } - ) - return context + def get_extra_context(self): + return { + 'object': self.get_workflow(), + 'title': _( + 'Create states for workflow: %s' + ) % self.get_workflow() + } def get_workflow(self): return get_object_or_404(Workflow, pk=self.kwargs['pk']) @@ -356,20 +323,12 @@ class SetupWorkflowStateDeleteView(SingleObjectDeleteView): model = WorkflowState view_permission = permission_workflow_delete - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowStateDeleteView, self - ).get_context_data(**kwargs) - - context.update( - { - 'navigation_object_list': ('object', 'workflow_instance'), - 'object': self.get_object().workflow, - 'workflow_instance': self.get_object(), - } - ) - - return context + def get_extra_context(self): + return { + 'navigation_object_list': ('object', 'workflow_instance'), + 'object': self.get_object().workflow, + 'workflow_instance': self.get_object(), + } def get_success_url(self): return reverse( @@ -383,20 +342,12 @@ class SetupWorkflowStateEditView(SingleObjectEditView): model = WorkflowState view_permission = permission_workflow_edit - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowStateEditView, self - ).get_context_data(**kwargs) - - context.update( - { - 'navigation_object_list': ('object', 'workflow_instance'), - 'object': self.get_object().workflow, - 'workflow_instance': self.get_object(), - } - ) - - return context + def get_extra_context(self): + return { + 'navigation_object_list': ('object', 'workflow_instance'), + 'object': self.get_object().workflow, + 'workflow_instance': self.get_object(), + } def get_success_url(self): return reverse( @@ -429,21 +380,14 @@ class SetupWorkflowTransitionListView(SingleObjectListView): def get_queryset(self): return self.get_workflow().transitions.all() - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowTransitionListView, self - ).get_context_data(**kwargs) - context.update( - { - 'hide_link': True, - 'object': self.get_workflow(), - 'title': _( - 'Transitions of workflow: %s' - ) % self.get_workflow() - } - ) - - return context + def get_extra_context(self): + return { + 'hide_link': True, + 'object': self.get_workflow(), + 'title': _( + 'Transitions of workflow: %s' + ) % self.get_workflow() + } class SetupWorkflowTransitionCreateView(SingleObjectCreateView): @@ -463,19 +407,13 @@ class SetupWorkflowTransitionCreateView(SingleObjectCreateView): SetupWorkflowTransitionCreateView, self ).dispatch(request, *args, **kwargs) - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowTransitionCreateView, self - ).get_context_data(**kwargs) - context.update( - { - 'object': self.get_workflow(), - 'title': _( - 'Create transitions for workflow: %s' - ) % self.get_workflow() - } - ) - return context + def get_extra_context(self): + return { + 'object': self.get_workflow(), + 'title': _( + 'Create transitions for workflow: %s' + ) % self.get_workflow() + } def get_form_kwargs(self): kwargs = super( @@ -516,20 +454,12 @@ class SetupWorkflowTransitionDeleteView(SingleObjectDeleteView): model = WorkflowTransition view_permission = permission_workflow_delete - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowTransitionDeleteView, self - ).get_context_data(**kwargs) - - context.update( - { - 'object': self.get_object().workflow, - 'navigation_object_list': ('object', 'workflow_instance'), - 'workflow_instance': self.get_object(), - } - ) - - return context + def get_extra_context(self): + return { + 'object': self.get_object().workflow, + 'navigation_object_list': ('object', 'workflow_instance'), + 'workflow_instance': self.get_object(), + } def get_success_url(self): return reverse( @@ -543,20 +473,12 @@ class SetupWorkflowTransitionEditView(SingleObjectEditView): model = WorkflowTransition view_permission = permission_workflow_edit - def get_context_data(self, **kwargs): - context = super( - SetupWorkflowTransitionEditView, self - ).get_context_data(**kwargs) - - context.update( - { - 'navigation_object_list': ('object', 'workflow_instance'), - 'object': self.get_object().workflow, - 'workflow_instance': self.get_object(), - } - ) - - return context + def get_extra_context(self): + return { + 'navigation_object_list': ('object', 'workflow_instance'), + 'object': self.get_object().workflow, + 'workflow_instance': self.get_object(), + } def get_form_kwargs(self): kwargs = super( diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 98ff2b9d6d..fb6f21773a 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -60,18 +60,13 @@ class SetupSmartLinkDocumentTypesView(AssignRemoveView): def remove(self, item): self.get_object().document_types.remove(item) - def get_context_data(self, **kwargs): - data = super( - SetupSmartLinkDocumentTypesView, self - ).get_context_data(**kwargs) - data.update({ + def get_extra_context(self): + return { 'object': self.get_object(), 'title': _( 'Document type for which to enable smart link: %s' - ) % self.get_object(), - }) - - return data + ) % self.get_object() + } class ResolvedSmartLinkView(DocumentListView): diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 861becc1fb..35cb5aabe5 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -598,20 +598,13 @@ class SetupDocumentTypeMetadataOptionalView(AssignRemoveView): def remove(self, item): item.delete() - def get_context_data(self, **kwargs): - data = super( - SetupDocumentTypeMetadataOptionalView, self - ).get_context_data(**kwargs) - data.update( - { - 'object': self.get_object(), - 'title': _( - 'Optional metadata types for document type: %s' - ) % self.get_object(), - } - ) - - return data + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _( + 'Optional metadata types for document type: %s' + ) % self.get_object(), + } class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalView): @@ -623,17 +616,10 @@ class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalVie self.get_object().metadata.filter(required=True) ) - def get_context_data(self, **kwargs): - data = super( - SetupDocumentTypeMetadataRequiredView, self - ).get_context_data(**kwargs) - data.update( - { - 'object': self.get_object(), - 'title': _( - 'Required metadata types for document type: %s' - ) % self.get_object(), - } - ) - - return data + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _( + 'Required metadata types for document type: %s' + ) % self.get_object(), + } diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index ddc3ca9d37..2337581c93 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -97,20 +97,12 @@ class DocumentTypeSettingsEditView(SingleObjectEditView): DocumentType, pk=self.kwargs['pk'] ).ocr_settings - def get_context_data(self, **kwargs): - context = super( - DocumentTypeSettingsEditView, self - ).get_context_data(**kwargs) - - context.update( - { - 'title': _( - 'Edit OCR settings for document type: %s' - ) % self.get_object().document_type - } - ) - - return context + def get_extra_context(self): + return { + 'title': _( + 'Edit OCR settings for document type: %s' + ) % self.get_object().document_type + } def document_content(request, document_id):