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

Replace usage of get_context_data with get_extra_context.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-15 03:02:02 -04:00
parent 66d22dc254
commit 561b56b12a
6 changed files with 116 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mayan/apps/acls/views.py
View File

@@ -147,15 +147,10 @@ class ACLDeleteView(SingleObjectDeleteView):
return super(ACLDeleteView, self).dispatch(request, *args, **kwargs) return super(ACLDeleteView, self).dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super(ACLDeleteView, self).get_context_data(**kwargs) return {
context.update( 'object': self.get_object().content_object,
{ }
'object': self.get_object().content_object,
}
)
return context
class ACLPermissionsView(AssignRemoveView): class ACLPermissionsView(AssignRemoveView):

11
mayan/apps/document_indexing/views.py
View File

@@ -150,16 +150,11 @@ class SetupIndexDocumentTypesView(AssignRemoveView):
def remove(self, item): def remove(self, item):
self.get_object().document_types.remove(item) self.get_object().document_types.remove(item)
def get_context_data(self, **kwargs): def get_extra_context(self):
data = super( return {
SetupIndexDocumentTypesView, self
).get_context_data(**kwargs)
data.update({
'object': self.get_object(), 'object': self.get_object(),
'title': _('Document types linked to index: %s') % self.get_object() 'title': _('Document types linked to index: %s') % self.get_object()
}) }
return data
# Node views # Node views

248
mayan/apps/document_states/views.py
View File

@@ -49,25 +49,18 @@ class DocumentWorkflowInstanceListView(SingleObjectListView):
def get_document(self): def get_document(self):
return get_object_or_404(Document, pk=self.kwargs['pk']) 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): def get_queryset(self):
return self.get_document().workflows.all() 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): class WorkflowDocumentListView(DocumentListView):
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
@@ -162,36 +155,28 @@ class WorkflowInstanceTransitionView(FormView):
) )
return HttpResponseRedirect(self.get_success_url()) 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): def get_form_kwargs(self):
kwargs = super(WorkflowInstanceTransitionView, self).get_form_kwargs() kwargs = super(WorkflowInstanceTransitionView, self).get_form_kwargs()
kwargs['workflow'] = self.get_workflow_instance() kwargs['workflow'] = self.get_workflow_instance()
return kwargs 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): def get_success_url(self):
return self.get_workflow_instance().get_absolute_url() return self.get_workflow_instance().get_absolute_url()
def get_workflow_instance(self):
return get_object_or_404(WorkflowInstance, pk=self.kwargs['pk'])
# Setup # Setup
@@ -235,6 +220,14 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView):
# TODO: add task launching this workflow for all the document types # TODO: add task launching this workflow for all the document types
# of item # 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): def get_object(self):
return get_object_or_404(Workflow, pk=self.kwargs['pk']) 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 # TODO: add task deleting this workflow for all the document types of
# item # 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): class SetupWorkflowStateListView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
@@ -282,25 +262,18 @@ class SetupWorkflowStateListView(SingleObjectListView):
SetupWorkflowStateListView, self SetupWorkflowStateListView, self
).dispatch(request, *args, **kwargs) ).dispatch(request, *args, **kwargs)
def get_workflow(self): def get_extra_context(self):
return get_object_or_404(Workflow, pk=self.kwargs['pk']) return {
'hide_link': True,
'object': self.get_workflow(),
'title': _('States of workflow: %s') % self.get_workflow()
}
def get_queryset(self): def get_queryset(self):
return self.get_workflow().states.all() return self.get_workflow().states.all()
def get_context_data(self, **kwargs): def get_workflow(self):
context = super( return get_object_or_404(Workflow, pk=self.kwargs['pk'])
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
class SetupWorkflowStateCreateView(SingleObjectCreateView): class SetupWorkflowStateCreateView(SingleObjectCreateView):
@@ -320,19 +293,13 @@ class SetupWorkflowStateCreateView(SingleObjectCreateView):
SetupWorkflowStateCreateView, self SetupWorkflowStateCreateView, self
).dispatch(request, *args, **kwargs) ).dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowStateCreateView, self 'object': self.get_workflow(),
).get_context_data(**kwargs) 'title': _(
context.update( 'Create states for workflow: %s'
{ ) % self.get_workflow()
'object': self.get_workflow(), }
'title': _(
'Create states for workflow: %s'
) % self.get_workflow()
}
)
return context
def get_workflow(self): def get_workflow(self):
return get_object_or_404(Workflow, pk=self.kwargs['pk']) return get_object_or_404(Workflow, pk=self.kwargs['pk'])
@@ -356,20 +323,12 @@ class SetupWorkflowStateDeleteView(SingleObjectDeleteView):
model = WorkflowState model = WorkflowState
view_permission = permission_workflow_delete view_permission = permission_workflow_delete
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowStateDeleteView, self 'navigation_object_list': ('object', 'workflow_instance'),
).get_context_data(**kwargs) 'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
context.update( }
{
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}
)
return context
def get_success_url(self): def get_success_url(self):
return reverse( return reverse(
@@ -383,20 +342,12 @@ class SetupWorkflowStateEditView(SingleObjectEditView):
model = WorkflowState model = WorkflowState
view_permission = permission_workflow_edit view_permission = permission_workflow_edit
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowStateEditView, self 'navigation_object_list': ('object', 'workflow_instance'),
).get_context_data(**kwargs) 'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
context.update( }
{
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}
)
return context
def get_success_url(self): def get_success_url(self):
return reverse( return reverse(
@@ -429,21 +380,14 @@ class SetupWorkflowTransitionListView(SingleObjectListView):
def get_queryset(self): def get_queryset(self):
return self.get_workflow().transitions.all() return self.get_workflow().transitions.all()
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowTransitionListView, self 'hide_link': True,
).get_context_data(**kwargs) 'object': self.get_workflow(),
context.update( 'title': _(
{ 'Transitions of workflow: %s'
'hide_link': True, ) % self.get_workflow()
'object': self.get_workflow(), }
'title': _(
'Transitions of workflow: %s'
) % self.get_workflow()
}
)
return context
class SetupWorkflowTransitionCreateView(SingleObjectCreateView): class SetupWorkflowTransitionCreateView(SingleObjectCreateView):
@@ -463,19 +407,13 @@ class SetupWorkflowTransitionCreateView(SingleObjectCreateView):
SetupWorkflowTransitionCreateView, self SetupWorkflowTransitionCreateView, self
).dispatch(request, *args, **kwargs) ).dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowTransitionCreateView, self 'object': self.get_workflow(),
).get_context_data(**kwargs) 'title': _(
context.update( 'Create transitions for workflow: %s'
{ ) % self.get_workflow()
'object': self.get_workflow(), }
'title': _(
'Create transitions for workflow: %s'
) % self.get_workflow()
}
)
return context
def get_form_kwargs(self): def get_form_kwargs(self):
kwargs = super( kwargs = super(
@@ -516,20 +454,12 @@ class SetupWorkflowTransitionDeleteView(SingleObjectDeleteView):
model = WorkflowTransition model = WorkflowTransition
view_permission = permission_workflow_delete view_permission = permission_workflow_delete
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowTransitionDeleteView, self 'object': self.get_object().workflow,
).get_context_data(**kwargs) 'navigation_object_list': ('object', 'workflow_instance'),
'workflow_instance': self.get_object(),
context.update( }
{
'object': self.get_object().workflow,
'navigation_object_list': ('object', 'workflow_instance'),
'workflow_instance': self.get_object(),
}
)
return context
def get_success_url(self): def get_success_url(self):
return reverse( return reverse(
@@ -543,20 +473,12 @@ class SetupWorkflowTransitionEditView(SingleObjectEditView):
model = WorkflowTransition model = WorkflowTransition
view_permission = permission_workflow_edit view_permission = permission_workflow_edit
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
SetupWorkflowTransitionEditView, self 'navigation_object_list': ('object', 'workflow_instance'),
).get_context_data(**kwargs) 'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
context.update( }
{
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}
)
return context
def get_form_kwargs(self): def get_form_kwargs(self):
kwargs = super( kwargs = super(

13
mayan/apps/linking/views.py
View File

@@ -60,18 +60,13 @@ class SetupSmartLinkDocumentTypesView(AssignRemoveView):
def remove(self, item): def remove(self, item):
self.get_object().document_types.remove(item) self.get_object().document_types.remove(item)
def get_context_data(self, **kwargs): def get_extra_context(self):
data = super( return {
SetupSmartLinkDocumentTypesView, self
).get_context_data(**kwargs)
data.update({
'object': self.get_object(), 'object': self.get_object(),
'title': _( 'title': _(
'Document type for which to enable smart link: %s' 'Document type for which to enable smart link: %s'
) % self.get_object(), ) % self.get_object()
}) }
return data
class ResolvedSmartLinkView(DocumentListView): class ResolvedSmartLinkView(DocumentListView):

42
mayan/apps/metadata/views.py
View File

@@ -598,20 +598,13 @@ class SetupDocumentTypeMetadataOptionalView(AssignRemoveView):
def remove(self, item): def remove(self, item):
item.delete() item.delete()
def get_context_data(self, **kwargs): def get_extra_context(self):
data = super( return {
SetupDocumentTypeMetadataOptionalView, self 'object': self.get_object(),
).get_context_data(**kwargs) 'title': _(
data.update( 'Optional metadata types for document type: %s'
{ ) % self.get_object(),
'object': self.get_object(), }
'title': _(
'Optional metadata types for document type: %s'
) % self.get_object(),
}
)
return data
class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalView): class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalView):
@@ -623,17 +616,10 @@ class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalVie
self.get_object().metadata.filter(required=True) self.get_object().metadata.filter(required=True)
) )
def get_context_data(self, **kwargs): def get_extra_context(self):
data = super( return {
SetupDocumentTypeMetadataRequiredView, self 'object': self.get_object(),
).get_context_data(**kwargs) 'title': _(
data.update( 'Required metadata types for document type: %s'
{ ) % self.get_object(),
'object': self.get_object(), }
'title': _(
'Required metadata types for document type: %s'
) % self.get_object(),
}
)
return data

20
mayan/apps/ocr/views.py
View File

@@ -97,20 +97,12 @@ class DocumentTypeSettingsEditView(SingleObjectEditView):
DocumentType, pk=self.kwargs['pk'] DocumentType, pk=self.kwargs['pk']
).ocr_settings ).ocr_settings
def get_context_data(self, **kwargs): def get_extra_context(self):
context = super( return {
DocumentTypeSettingsEditView, self 'title': _(
).get_context_data(**kwargs) 'Edit OCR settings for document type: %s'
) % self.get_object().document_type
context.update( }
{
'title': _(
'Edit OCR settings for document type: %s'
) % self.get_object().document_type
}
)
return context
def document_content(request, document_id): def document_content(request, document_id):