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

Reference the external object directly

Browse Source 
This object is placed in the view context by the mixin automatically.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-10 00:44:47 -04:00
parent c1612c8182
commit bbf3ede2e6
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/document_states/views/workflow_views.py
View File

@@ -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 {

6
mayan/apps/documents/views/document_page_views.py
View File

@@ -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 = {

4
mayan/apps/documents/views/document_type_views.py
View File

@@ -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 {

4
mayan/apps/documents/views/document_version_views.py
View File

@@ -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:

10
mayan/apps/tags/views.py
View File

@@ -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()