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

Remove PreserveGetQuerySet mixin. Update SingleObjectList and

Browse Source 
MultipleObjectFormActionView views to use a new get_object_list method.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-08-16 22:11:22 -04:00
parent c43f5eb66e
commit 2052caada4
39 changed files with 540 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,14 +119,6 @@ class SetupIndexDocumentTypesView(AssignRemoveView):
class SetupIndexTreeTemplateListView(SingleObjectListView):
object_permission = permission_document_indexing_edit
def get_index(self):
return get_object_or_404(Index, pk=self.kwargs['pk'])
def get_queryset(self):
return self.get_index().template_root.get_descendants(
include_self=True
)
def get_extra_context(self):
return {
'hide_object': True,
@@ -135,6 +127,14 @@ class SetupIndexTreeTemplateListView(SingleObjectListView):
'title': _('Tree template nodes for index: %s') % self.get_index(),
}
def get_index(self):
return get_object_or_404(Index, pk=self.kwargs['pk'])
def get_object_list(self):
return self.get_index().template_root.get_descendants(
include_self=True
)
class TemplateNodeCreateView(SingleObjectCreateView):
form_class = IndexTemplateNodeForm
@@ -242,19 +242,6 @@ class IndexInstanceNodeView(DocumentListView):
return SingleObjectListView.dispatch(self, request, *args, **kwargs)
def get_queryset(self):
if self.index_instance_node:
if self.index_instance_node.index_template_node.link_documents:
return DocumentListView.get_queryset(self)
else:
self.object_permission = None
return self.index_instance_node.get_children().order_by(
'value'
)
else:
self.object_permission = None
return IndexInstanceNode.objects.none()
def get_document_queryset(self):
if self.index_instance_node:
if self.index_instance_node.index_template_node.link_documents:
@@ -286,6 +273,19 @@ class IndexInstanceNodeView(DocumentListView):
return context
def get_object_list(self):
if self.index_instance_node:
if self.index_instance_node.index_template_node.link_documents:
return DocumentListView.get_queryset(self)
else:
self.object_permission = None
return self.index_instance_node.get_children().order_by(
'value'
)
else:
self.object_permission = None
return IndexInstanceNode.objects.none()
class DocumentIndexNodeListView(SingleObjectListView):
"""
@@ -317,7 +317,7 @@ class DocumentIndexNodeListView(SingleObjectListView):
) % self.get_document(),
}
def get_queryset(self):
def get_object_list(self):
return DocumentIndexInstanceNode.objects.get_for(self.get_document())