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

Change the variable name to better represent the class of the instance.

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-04 00:11:18 -04:00
parent afb44798e0
commit 5da301a861
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,7 +240,7 @@ class IndexInstanceNodeView(DocumentListView):
template_name = 'document_indexing/node_details.html' template_name = 'document_indexing/node_details.html'
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
self.index_instance = get_object_or_404( self.index_instance_node = get_object_or_404(
IndexInstanceNode, pk=self.kwargs['pk'] IndexInstanceNode, pk=self.kwargs['pk']
) )
@@ -251,11 +251,11 @@ class IndexInstanceNodeView(DocumentListView):
except PermissionDenied: except PermissionDenied:
AccessControlList.objects.check_access( AccessControlList.objects.check_access(
permission_document_indexing_view, permission_document_indexing_view,
request.user, self.index_instance.index() request.user, self.index_instance_node.index()
) )
if self.index_instance: if self.index_instance_node:
if self.index_instance.index_template_node.link_documents: if self.index_instance_node.index_template_node.link_documents:
return DocumentListView.dispatch( return DocumentListView.dispatch(
self, request, *args, **kwargs self, request, *args, **kwargs
) )
@@ -263,36 +263,36 @@ class IndexInstanceNodeView(DocumentListView):
return SingleObjectListView.dispatch(self, request, *args, **kwargs) return SingleObjectListView.dispatch(self, request, *args, **kwargs)
def get_queryset(self): def get_queryset(self):
if self.index_instance: if self.index_instance_node:
if self.index_instance.index_template_node.link_documents: if self.index_instance_node.index_template_node.link_documents:
return DocumentListView.get_queryset(self) return DocumentListView.get_queryset(self)
else: else:
self.object_permission = None self.object_permission = None
return self.index_instance.get_children().order_by('value') return self.index_instance_node.get_children().order_by('value')
else: else:
self.object_permission = None self.object_permission = None
return IndexInstanceNode.objects.none() return IndexInstanceNode.objects.none()
def get_document_queryset(self): def get_document_queryset(self):
if self.index_instance: if self.index_instance_node:
if self.index_instance.index_template_node.link_documents: if self.index_instance_node.index_template_node.link_documents:
return self.index_instance.documents.all() return self.index_instance_node.documents.all()
def get_extra_context(self): def get_extra_context(self):
context = { context = {
'hide_links': True, 'hide_links': True,
'object': self.index_instance, 'object': self.index_instance_node,
'navigation': mark_safe( 'navigation': mark_safe(
_('Navigation: %s') % node_tree( _('Navigation: %s') % node_tree(
node=self.index_instance, user=self.request.user node=self.index_instance_node, user=self.request.user
) )
), ),
'title': _( 'title': _(
'Contents for index: %s' 'Contents for index: %s'
) % self.index_instance.get_full_path(), ) % self.index_instance_node.get_full_path(),
} }
if self.index_instance and not self.index_instance.index_template_node.link_documents: if self.index_instance_node and not self.index_instance_node.index_template_node.link_documents:
context.update({'hide_object': True}) context.update({'hide_object': True})
return context return context