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

PEP8 and code style cleanups. Replace lists with tuples.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-12 04:41:59 -04:00
parent 31f05ee3f3
commit d04117d345
21 changed files with 231 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/checkouts/api_views.py
View File

@@ -129,8 +129,8 @@ class APICheckedoutDocumentView(generics.RetrieveDestroyAPIView):
"""
return super(
APICheckedoutDocumentView, self).get(request, *args, **kwargs
)
APICheckedoutDocumentView, self
).get(request, *args, **kwargs)
def delete(self, request, *args, **kwargs):
"""

15
mayan/apps/checkouts/views.py
View File

@@ -1,6 +1,5 @@
from __future__ import absolute_import, unicode_literals
from django.conf import settings
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
@@ -35,7 +34,7 @@ class CheckoutDocumentView(SingleObjectCreateView):
try:
Permission.check_permissions(
request.user, [permission_document_checkout]
request.user, (permission_document_checkout,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -74,7 +73,7 @@ class CheckoutDocumentView(SingleObjectCreateView):
}
def get_post_action_redirect(self):
return reverse('checkouts:checkout_info', args=[self.document.pk])
return reverse('checkouts:checkout_info', args=(self.document.pk,))
class CheckoutListView(DocumentListView):
@@ -111,13 +110,13 @@ def checkout_info(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(
request.user, [
request.user, (
permission_document_checkout, permission_document_checkin
]
)
)
except PermissionDenied:
AccessControlList.objects.check_access(
[permission_document_checkout, permission_document_checkin],
(permission_document_checkout, permission_document_checkin),
request.user, document
)
@@ -128,7 +127,9 @@ def checkout_info(request, document_pk):
if document.is_checked_out():
checkout_info = document.checkout_info()
paragraphs.append(
_('User: %s') % (checkout_info.user.get_full_name() or checkout_info.user)
_('User: %s') % (
checkout_info.user.get_full_name() or checkout_info.user
)
)
paragraphs.append(
_('Check out time: %s') % checkout_info.checkout_datetime

2
mayan/apps/converter/links.py
View File

@@ -27,7 +27,7 @@ def get_kwargs_factory(variable_name):
link_transformation_create = Link(
kwargs=get_kwargs_factory('content_object'),
permissions=[permission_transformation_create],
permissions=(permission_transformation_create,),
text=_('Create new transformation'), view='converter:transformation_create'
)
link_transformation_delete = Link(

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

@@ -36,7 +36,7 @@ class TransformationDeleteView(SingleObjectDeleteView):
try:
Permission.check_permissions(
request.user, [permission_transformation_delete]
request.user, (permission_transformation_delete,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -50,11 +50,11 @@ class TransformationDeleteView(SingleObjectDeleteView):
def get_post_action_redirect(self):
return reverse(
'converter:transformation_list', args=[
'converter:transformation_list', args=(
self.transformation.content_type.app_label,
self.transformation.content_type.model,
self.transformation.object_id
]
)
)
def get_extra_context(self):
@@ -62,11 +62,11 @@ class TransformationDeleteView(SingleObjectDeleteView):
'content_object': self.transformation.content_object,
'navigation_object_list': ['content_object', 'transformation'],
'previous': reverse(
'converter:transformation_list', args=[
'converter:transformation_list', args=(
self.transformation.content_type.app_label,
self.transformation.content_type.model,
self.transformation.object_id
]
)
),
'title': _(
'Delete transformation "%(transformation)s" for: '
@@ -97,7 +97,7 @@ class TransformationCreateView(SingleObjectCreateView):
try:
Permission.check_permissions(
request.user, [permission_transformation_create]
request.user, (permission_transformation_create,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -152,7 +152,7 @@ class TransformationEditView(SingleObjectEditView):
try:
Permission.check_permissions(
request.user, [permission_transformation_edit]
request.user, (permission_transformation_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -176,11 +176,11 @@ class TransformationEditView(SingleObjectEditView):
def get_post_action_redirect(self):
return reverse(
'converter:transformation_list', args=[
'converter:transformation_list', args=(
self.transformation.content_type.app_label,
self.transformation.content_type.model,
self.transformation.object_id
]
)
)
def get_extra_context(self):
@@ -213,7 +213,7 @@ class TransformationListView(SingleObjectListView):
try:
Permission.check_permissions(
request.user, [permission_transformation_view]
request.user, (permission_transformation_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

8
mayan/apps/django_gpg/views.py
View File

@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
def key_receive(request, key_id):
Permission.check_permissions(request.user, [permission_key_receive])
Permission.check_permissions(request.user, (permission_key_receive,))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -68,7 +68,7 @@ class PublicKeyListView(SingleObjectListView):
view_permission = permission_key_view
def get_extra_context(self):
return {
return {
'extra_columns': [
{
'name': _('Key ID'),
@@ -99,7 +99,7 @@ class PrivateKeyListView(PublicKeyListView):
def key_delete(request, fingerprint, key_type):
Permission.check_permissions(request.user, [permission_key_delete])
Permission.check_permissions(request.user, (permission_key_delete,))
secret = key_type == 'sec'
key = Key.get(gpg, fingerprint, secret=secret)
@@ -130,7 +130,7 @@ def key_delete(request, fingerprint, key_type):
def key_query(request):
Permission.check_permissions(request.user, [permission_keyserver_query])
Permission.check_permissions(request.user, (permission_keyserver_query,))
subtemplates_list = []
term = request.GET.get('term')

4
mayan/apps/document_indexing/api_views.py
View File

@@ -101,7 +101,7 @@ class APIIndexNodeInstanceDocumentListView(generics.ListAPIView):
)
try:
Permission.check_permissions(
self.request.user, [permission_document_indexing_view]
self.request.user, (permission_document_indexing_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -179,7 +179,7 @@ class APIDocumentIndexListView(generics.ListAPIView):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
try:
Permission.check_permissions(
self.request.user, [permission_document_view]
self.request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

2
mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations
from django.template.defaultfilters import slugify

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

@@ -54,7 +54,11 @@ class SetupIndexListView(SingleObjectListView):
'extra_columns': [
{'name': _('Label'), 'attribute': 'label'},
{'name': _('Slug'), 'attribute': 'slug'},
{'name': _('Enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
{
'name': _('Enabled'), 'attribute': encapsulate(
lambda x: two_state_template(x.enabled)
)
},
]
}
@@ -88,9 +92,13 @@ def index_setup_view(request, index_pk):
index = get_object_or_404(Index, pk=index_pk)
try:
Permission.check_permissions(request.user, [permission_document_indexing_setup])
Permission.check_permissions(
request.user, (permission_document_indexing_setup,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_indexing_setup, request.user, index)
AccessControlList.objects.check_access(
permission_document_indexing_setup, request.user, index
)
object_list = index.template_root.get_descendants(include_self=True)
@@ -101,14 +109,28 @@ def index_setup_view(request, index_pk):
'title': _('Tree template nodes for index: %s') % index,
'hide_object': True,
'extra_columns': [
{'name': _('Level'), 'attribute': encapsulate(lambda x: node_level(x))},
{'name': _('Enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
{'name': _('Has document links?'), 'attribute': encapsulate(lambda x: two_state_template(x.link_documents))},
{
'name': _('Level'), 'attribute': encapsulate(
lambda x: node_level(x)
)
},
{
'name': _('Enabled'), 'attribute': encapsulate(
lambda x: two_state_template(x.enabled)
)
},
{
'name': _('Has document links?'), 'attribute': encapsulate(
lambda x: two_state_template(x.link_documents)
)
},
],
}
return render_to_response('appearance/generic_list.html', context,
context_instance=RequestContext(request))
return render_to_response(
'appearance/generic_list.html', context,
context_instance=RequestContext(request)
)
class SetupIndexDocumentTypesView(AssignRemoveView):
@@ -124,16 +146,24 @@ class SetupIndexDocumentTypesView(AssignRemoveView):
return get_object_or_404(Index, pk=self.kwargs['pk'])
def left_list(self):
return AssignRemoveView.generate_choices(DocumentType.objects.exclude(pk__in=self.get_object().document_types.all()))
return AssignRemoveView.generate_choices(
DocumentType.objects.exclude(
pk__in=self.get_object().document_types.all()
)
)
def right_list(self):
return AssignRemoveView.generate_choices(self.get_object().document_types.all())
return AssignRemoveView.generate_choices(
self.get_object().document_types.all()
)
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 = super(
SetupIndexDocumentTypesView, self
).get_context_data(**kwargs)
data.update({
'object': self.get_object(),
'title': _('Document types linked to index: %s') % self.get_object()
@@ -147,18 +177,28 @@ def template_node_create(request, parent_pk):
parent_node = get_object_or_404(IndexTemplateNode, pk=parent_pk)
try:
Permission.check_permissions(request.user, [permission_document_indexing_edit])
Permission.check_permissions(
request.user, (permission_document_indexing_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_indexing_edit, request.user, parent_node.index)
AccessControlList.objects.check_access(
permission_document_indexing_edit, request.user, parent_node.index
)
if request.method == 'POST':
form = IndexTemplateNodeForm(request.POST)
if form.is_valid():
node = form.save()
messages.success(request, _('Index template node created successfully.'))
return HttpResponseRedirect(reverse('indexing:index_setup_view', args=[node.index.pk]))
messages.success(
request, _('Index template node created successfully.')
)
return HttpResponseRedirect(
reverse('indexing:index_setup_view', args=(node.index.pk,))
)
else:
form = IndexTemplateNodeForm(initial={'index': parent_node.index, 'parent': parent_node})
form = IndexTemplateNodeForm(
initial={'index': parent_node.index, 'parent': parent_node}
)
return render_to_response('appearance/generic_form.html', {
'form': form,
@@ -172,16 +212,24 @@ def template_node_edit(request, node_pk):
node = get_object_or_404(IndexTemplateNode, pk=node_pk)
try:
Permission.check_permissions(request.user, [permission_document_indexing_edit])
Permission.check_permissions(
request.user, (permission_document_indexing_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_indexing_edit, request.user, node.index)
AccessControlList.objects.check_access(
permission_document_indexing_edit, request.user, node.index
)
if request.method == 'POST':
form = IndexTemplateNodeForm(request.POST, instance=node)
if form.is_valid():
form.save()
messages.success(request, _('Index template node edited successfully'))
return HttpResponseRedirect(reverse('indexing:index_setup_view', args=[node.index.pk]))
messages.success(
request, _('Index template node edited successfully')
)
return HttpResponseRedirect(
reverse('indexing:index_setup_view', args=(node.index.pk,))
)
else:
form = IndexTemplateNodeForm(instance=node)
@@ -198,11 +246,17 @@ def template_node_delete(request, node_pk):
node = get_object_or_404(IndexTemplateNode, pk=node_pk)
try:
Permission.check_permissions(request.user, [permission_document_indexing_edit])
Permission.check_permissions(
request.user, (permission_document_indexing_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_indexing_edit, request.user, node.index)
AccessControlList.objects.check_access(
permission_document_indexing_edit, request.user, node.index
)
post_action_redirect = reverse('indexing:index_setup_view', args=[node.index.pk])
post_action_redirect = reverse(
'indexing:index_setup_view', args=(node.index.pk,)
)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -212,8 +266,11 @@ def template_node_delete(request, node_pk):
node.delete()
messages.success(request, _('Node: %s deleted successfully.') % node)
except Exception as exception:
messages.error(request, _('Node: %(node)s delete error: %(error)s') % {
'node': node, 'error': exception})
messages.error(
request, _('Node: %(node)s delete error: %(error)s') % {
'node': node, 'error': exception
}
)
return HttpResponseRedirect(next)
@@ -227,8 +284,10 @@ def template_node_delete(request, node_pk):
'previous': previous,
}
return render_to_response('appearance/generic_confirm.html', context,
context_instance=RequestContext(request))
return render_to_response(
'appearance/generic_confirm.html', context,
context_instance=RequestContext(request)
)
class IndexListView(SingleObjectListView):
@@ -250,8 +309,15 @@ class IndexListView(SingleObjectListView):
'title': _('Indexes'),
'hide_links': True,
'extra_columns': [
{'name': _('Items'), 'attribute': encapsulate(lambda instance: IndexListView.get_items_count(instance))},
{'name': _('Document types'), 'attribute': 'get_document_types_names'},
{
'name': _('Items'), 'attribute': encapsulate(
lambda instance: IndexListView.get_items_count(instance)
)
},
{
'name': _('Document types'),
'attribute': 'get_document_types_names'
},
],
}
@@ -263,21 +329,30 @@ class IndexInstanceNodeView(DocumentListView, SingleObjectListView):
queryset = instance.documents
try:
Permission.check_permissions(user, [permission_document_view])
Permission.check_permissions(user, (permission_document_view,))
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(permission_document_view, user, queryset)
queryset = AccessControlList.objects.filter_by_access(
permission_document_view, user, queryset
)
return queryset.count()
else:
return instance.get_children().count()
def dispatch(self, request, *args, **kwargs):
self.index_instance = get_object_or_404(IndexInstanceNode, pk=self.kwargs['pk'])
self.index_instance = get_object_or_404(
IndexInstanceNode, pk=self.kwargs['pk']
)
try:
Permission.check_permissions(request.user, [permission_document_indexing_view])
Permission.check_permissions(
request.user, (permission_document_indexing_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_indexing_view, request.user, self.index_instance.index)
AccessControlList.objects.check_access(
permission_document_indexing_view,
request.user, self.index_instance.index
)
if self.index_instance:
if self.index_instance.index_template_node.link_documents:
@@ -305,7 +380,9 @@ class IndexInstanceNodeView(DocumentListView, SingleObjectListView):
context = {
'hide_links': True,
'object': self.index_instance,
'title': mark_safe(_('Contents for index: %s') % get_breadcrumbs(self.index_instance))
'title': mark_safe(
_('Contents for index: %s') % get_breadcrumbs(self.index_instance)
)
}
if self.index_instance and not self.index_instance.index_template_node.link_documents:
@@ -314,11 +391,15 @@ class IndexInstanceNodeView(DocumentListView, SingleObjectListView):
'extra_columns': [
{
'name': _('Node'),
'attribute': encapsulate(lambda x: index_instance_item_link(x))
'attribute': encapsulate(
lambda x: index_instance_item_link(x)
)
},
{
'name': _('Items'),
'attribute': encapsulate(lambda instance: IndexInstanceNodeView.get_item_count(instance=instance, user=self.request.user))
'attribute': encapsulate(
lambda instance: IndexInstanceNodeView.get_item_count(instance=instance, user=self.request.user)
)
}
],
'hide_object': True,
@@ -332,7 +413,9 @@ def rebuild_index_instances(request):
"""
Confirmation view to execute the tool: do_rebuild_all_indexes
"""
Permission.check_permissions(request.user, [permission_document_indexing_rebuild_indexes])
Permission.check_permissions(
request.user, (permission_document_indexing_rebuild_indexes,)
)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -360,12 +443,23 @@ def document_index_list(request, document_id):
queryset = document.node_instances.all()
try:
# TODO: should be AND not OR
Permission.check_permissions(request.user, [permission_document_view, permission_document_indexing_view])
Permission.check_permissions(
request.user, (
permission_document_view, permission_document_indexing_view
)
)
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(permission_document_indexing_view, request.user, queryset, related='index')
queryset = AccessControlList.objects.filter_by_access(
permission_document_indexing_view, request.user, queryset,
related='index'
)
for index_instance in queryset:
object_list.append(get_breadcrumbs(index_instance, single_link=True, include_count=True))
object_list.append(
get_breadcrumbs(
index_instance, single_link=True, include_count=True
)
)
return render_to_response('appearance/generic_list.html', {
'object_list': object_list,

6
mayan/apps/document_indexing/widgets.py
View File

@@ -63,7 +63,11 @@ def get_breadcrumbs(index_instance, simple=False, single_link=False, include_cou
if single_link:
# Return the entire breadcrumb path as a single HTML anchor
output.insert(0, get_instance_link(index_instance_node=index_instance, text=(' / '.join(result))))
output.insert(
0, get_instance_link(
index_instance_node=index_instance, text=(' / '.join(result))
)
)
return mark_safe(' '.join(output))
else:
output.insert(0, ' / '.join(result))

2
mayan/apps/document_signatures/links.py
View File

@@ -34,7 +34,7 @@ link_document_signature_delete = Link(
link_document_signature_download = Link(
condition=can_delete_detached_signature, text=_('Download signature'),
view='signatures:document_signature_download', args='object.pk',
permissions=[permission_signature_download]
permissions=(permission_signature_download,)
)
link_document_signature_upload = Link(
condition=can_upload_detached_signature,

8
mayan/apps/document_signatures/views.py
View File

@@ -33,7 +33,7 @@ def document_verify(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(request.user, [permission_document_verify])
Permission.check_permissions(request.user, (permission_document_verify,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_verify, request.user, document)
@@ -80,7 +80,7 @@ def document_signature_upload(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(request.user, [permission_signature_upload])
Permission.check_permissions(request.user, (permission_signature_upload,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_signature_upload, request.user, document)
@@ -116,7 +116,7 @@ def document_signature_download(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(request.user, [permission_signature_download])
Permission.check_permissions(request.user, (permission_signature_download,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_signature_download, request.user, document)
@@ -140,7 +140,7 @@ def document_signature_delete(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(request.user, [permission_signature_delete])
Permission.check_permissions(request.user, (permission_signature_delete,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_signature_delete, request.user, document)

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

@@ -34,7 +34,7 @@ class DocumentWorkflowInstanceListView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_document_workflow_view]
request.user, (permission_document_workflow_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -75,7 +75,7 @@ class WorkflowDocumentListView(DocumentListView):
try:
Permission.check_permissions(
request.user, [permission_workflow_view]
request.user, (permission_workflow_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -103,7 +103,7 @@ class WorkflowInstanceDetailView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_document_workflow_view]
request.user, (permission_document_workflow_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -143,7 +143,7 @@ class WorkflowInstanceTransitionView(FormView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_document_workflow_transition]
request.user, (permission_document_workflow_transition,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -274,7 +274,7 @@ class SetupWorkflowStateListView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_workflow_edit]
request.user, (permission_workflow_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -312,7 +312,7 @@ class SetupWorkflowStateCreateView(SingleObjectCreateView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_workflow_edit]
request.user, (permission_workflow_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -415,7 +415,7 @@ class SetupWorkflowTransitionListView(SingleObjectListView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_workflow_edit]
request.user, (permission_workflow_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -455,7 +455,7 @@ class SetupWorkflowTransitionCreateView(SingleObjectCreateView):
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, [permission_workflow_edit]
request.user, (permission_workflow_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

70
mayan/apps/documents/views.py
View File

@@ -95,7 +95,7 @@ class DeletedDocumentListView(DocumentListView):
try:
Permission.check_permissions(
self.request.user, [permission_document_view]
self.request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -119,7 +119,7 @@ class DeletedDocumentDeleteView(ConfirmView):
try:
Permission.check_permissions(
request.user, [permission_document_delete]
request.user, (permission_document_delete,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -150,7 +150,7 @@ class DocumentRestoreView(ConfirmView):
try:
Permission.check_permissions(
request.user, [permission_document_restore]
request.user, (permission_document_restore,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -251,7 +251,7 @@ def document_properties(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(
permission_document_view, request.user, document
@@ -304,7 +304,7 @@ def document_preview(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(
permission_document_view, request.user, document
@@ -343,7 +343,7 @@ def document_trash(request, document_id=None, document_id_list=None):
)
try:
Permission.check_permissions(request.user, [permission_document_trash])
Permission.check_permissions(request.user, (permission_document_trash,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
permission_document_trash, request.user, documents
@@ -391,9 +391,13 @@ def document_multiple_trash(request):
def document_edit(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.check_permissions(request.user, [permission_document_properties_edit])
Permission.check_permissions(
request.user, (permission_document_properties_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_properties_edit, request.user, document)
AccessControlList.objects.check_access(
permission_document_properties_edit, request.user, document
)
if request.method == 'POST':
form = DocumentForm(request.POST, instance=document)
@@ -436,9 +440,13 @@ def document_document_type_edit(request, document_id=None, document_id_list=None
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try:
Permission.check_permissions(request.user, [permission_document_properties_edit])
Permission.check_permissions(
request.user, (permission_document_properties_edit,)
)
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(permission_document_properties_edit, request.user, documents)
documents = AccessControlList.objects.filter_by_access(
permission_document_properties_edit, request.user, documents
)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -486,9 +494,11 @@ def document_multiple_document_type_edit(request):
def get_document_image(request, document_id, size=setting_preview_size.value):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document)
AccessControlList.objects.check_access(
permission_document_view, request.user, document
)
page = int(request.GET.get('page', DEFAULT_PAGE_NUMBER))
@@ -522,7 +532,7 @@ def document_download(request, document_id=None, document_id_list=None, document
document_versions = [get_object_or_404(DocumentVersion, pk=document_version_pk)]
try:
Permission.check_permissions(request.user, [permission_document_download])
Permission.check_permissions(request.user, (permission_document_download,))
except PermissionDenied:
document_versions = AccessControlList.objects.filter_by_access(permission_document_download, request.user, document_versions, related='document')
@@ -630,7 +640,7 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try:
Permission.check_permissions(request.user, [permission_document_tools])
Permission.check_permissions(request.user, (permission_document_tools,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(permission_document_tools, request.user, documents)
@@ -682,7 +692,7 @@ def document_clear_transformations(request, document_id=None, document_id_list=N
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try:
Permission.check_permissions(request.user, [permission_transformation_delete])
Permission.check_permissions(request.user, (permission_transformation_delete,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(permission_transformation_delete, request.user, documents)
@@ -728,7 +738,7 @@ def document_page_view(request, document_page_id):
document_page = get_object_or_404(DocumentPage, pk=document_page_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -763,7 +773,7 @@ def document_page_navigation_next(request, document_page_id):
document_page = get_object_or_404(DocumentPage, pk=document_page_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -781,7 +791,7 @@ def document_page_navigation_previous(request, document_page_id):
document_page = get_object_or_404(DocumentPage, pk=document_page_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -800,7 +810,7 @@ def document_page_navigation_first(request, document_page_id):
document_page = get_object_or_404(document_page.siblings, page_number=1)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -814,7 +824,7 @@ def document_page_navigation_last(request, document_page_id):
document_page = get_object_or_404(document_page.siblings, page_number=document_page.siblings.count())
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -827,7 +837,7 @@ def transform_page(request, document_page_id, zoom_function=None, rotation_funct
document_page = get_object_or_404(DocumentPage, pk=document_page_id)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document_page.document)
@@ -848,7 +858,7 @@ def transform_page(request, document_page_id, zoom_function=None, rotation_funct
return HttpResponseRedirect(
'?'.join([
reverse(view, args=[document_page.pk]),
reverse(view, args=(document_page.pk,)),
urlencode({'zoom': zoom, 'rotation': rotation})
])
)
@@ -890,7 +900,7 @@ def document_print(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.check_permissions(request.user, [permission_document_print])
Permission.check_permissions(request.user, (permission_document_print,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_print, request.user, document)
@@ -982,7 +992,7 @@ class DocumentTypeCreateView(SingleObjectCreateView):
def document_type_filename_list(request, document_type_id):
Permission.check_permissions(request.user, [permission_document_type_view])
Permission.check_permissions(request.user, (permission_document_type_view,))
document_type = get_object_or_404(DocumentType, pk=document_type_id)
context = {
@@ -1004,7 +1014,7 @@ def document_type_filename_list(request, document_type_id):
def document_type_filename_edit(request, document_type_filename_id):
Permission.check_permissions(request.user, [permission_document_type_edit])
Permission.check_permissions(request.user, (permission_document_type_edit,))
document_type_filename = get_object_or_404(DocumentTypeFilename, pk=document_type_filename_id)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('documents:document_type_filename_list', args=[document_type_filename.document_type_id]))))
@@ -1036,7 +1046,7 @@ def document_type_filename_edit(request, document_type_filename_id):
def document_type_filename_delete(request, document_type_filename_id):
Permission.check_permissions(request.user, [permission_document_type_edit])
Permission.check_permissions(request.user, (permission_document_type_edit,))
document_type_filename = get_object_or_404(DocumentTypeFilename, pk=document_type_filename_id)
post_action_redirect = reverse('documents:document_type_filename_list', args=[document_type_filename.document_type_id])
@@ -1071,7 +1081,7 @@ def document_type_filename_delete(request, document_type_filename_id):
def document_type_filename_create(request, document_type_id):
Permission.check_permissions(request.user, [permission_document_type_edit])
Permission.check_permissions(request.user, (permission_document_type_edit,))
document_type = get_object_or_404(DocumentType, pk=document_type_id)
@@ -1102,7 +1112,7 @@ def document_type_filename_create(request, document_type_id):
def document_clear_image_cache(request):
Permission.check_permissions(request.user, [permission_document_tools])
Permission.check_permissions(request.user, (permission_document_tools,))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -1122,7 +1132,7 @@ def document_version_list(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.check_permissions(request.user, [permission_document_view])
Permission.check_permissions(request.user, (permission_document_view,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_view, request.user, document)
@@ -1162,7 +1172,7 @@ def document_version_revert(request, document_version_pk):
document_version = get_object_or_404(DocumentVersion, pk=document_version_pk)
try:
Permission.check_permissions(request.user, [permission_document_version_revert])
Permission.check_permissions(request.user, (permission_document_version_revert,))
except PermissionDenied:
AccessControlList.objects.check_access(permission_document_version_revert, request.user, document_version.document)

4
mayan/apps/dynamic_search/test_api.py
View File

@@ -6,14 +6,12 @@ from django.contrib.auth.models import User
from django.core.files import File
from django.core.urlresolvers import reverse
from rest_framework import status
from rest_framework.test import APITestCase
from documents.models import DocumentType
from documents.test_models import (
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE,
TEST_SMALL_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH,
)

2
mayan/apps/folders/api_views.py
View File

@@ -39,7 +39,7 @@ class APIDocumentFolderListView(generics.ListAPIView):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
try:
Permission.check_permissions(
self.request.user, [permission_document_view]
self.request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

2
mayan/apps/folders/forms.py
View File

@@ -23,7 +23,7 @@ class FolderListForm(forms.Form):
queryset = Folder.objects.all()
try:
Permission.check_permissions(user, [permission_folder_view])
Permission.check_permissions(user, (permission_folder_view,))
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(
permission_folder_view, user, queryset

12
mayan/apps/folders/views.py
View File

@@ -51,7 +51,7 @@ class FolderListView(SingleObjectListView):
queryset = instance.documents
try:
Permission.check_permissions(user, [permission_document_view])
Permission.check_permissions(user, (permission_document_view,))
except PermissionDenied:
queryset = AccessControlList.objects.filter_by_access(
permission_document_view, user, queryset
@@ -119,7 +119,7 @@ def folder_delete(request, folder_id):
folder = get_object_or_404(Folder, pk=folder_id)
try:
Permission.check_permissions(request.user, [permission_folder_delete])
Permission.check_permissions(request.user, (permission_folder_delete,))
except PermissionDenied:
AccessControlList.objects.check_access(
permission_folder_delete, request.user, folder
@@ -158,7 +158,7 @@ class FolderDetailView(DocumentListView):
try:
Permission.check_permissions(
self.request.user, [permission_folder_view]
self.request.user, (permission_folder_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -189,7 +189,7 @@ def folder_add_document(request, document_id=None, document_id_list=None):
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try:
Permission.check_permissions(request.user, [permission_folder_add_document])
Permission.check_permissions(request.user, (permission_folder_add_document,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(permission_folder_add_document, request.user, documents)
@@ -239,7 +239,7 @@ class DocumentFolderListView(FolderListView):
try:
Permission.check_permissions(
request.user, [permission_document_view]
request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -284,7 +284,7 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis
logger.debug('folder_documents (pre permission check): %s', folder_documents)
try:
Permission.check_permissions(request.user, [permission_folder_remove_document])
Permission.check_permissions(request.user, (permission_folder_remove_document,))
except PermissionDenied:
folder_documents = AccessControlList.objects.filter_by_access(permission_folder_remove_document, request.user, folder_documents)

2
mayan/apps/ocr/classes.py
View File

@@ -48,8 +48,6 @@ class OCRBackendBase(object):
logger.info('Starting OCR for document version: %s', document_version)
logger.debug('document version: %d', document_version.pk)
language = document_version.document.language
for document_page in document_version.pages.all():
self.process_document_page(document_page=document_page)

2
mayan/apps/rest_api/views.py
View File

@@ -4,8 +4,6 @@ import logging
from rest_framework import generics, renderers
from rest_framework.authtoken.views import ObtainAuthToken
from rest_framework.response import Response
from rest_framework.reverse import reverse
from .classes import APIVersion, APIEndPoint
from .serializers import APIAppSerializer, APIVersionSerializer

6
mayan/apps/tags/test_api.py
View File

@@ -1,19 +1,15 @@
from __future__ import unicode_literals
from json import loads
from django.contrib.auth.models import User
from django.core.files import File
from django.core.urlresolvers import reverse
from rest_framework import status
from rest_framework.test import APITestCase
from documents.models import DocumentType
from documents.test_models import (
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME,
TEST_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE,
TEST_SMALL_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH,
)
from .models import Tag

1
mayan/apps/user_management/serializers.py
View File

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
from django.contrib.auth.models import Group, User
from rest_framework import serializers
from rest_framework.reverse import reverse
class GroupSerializer(serializers.HyperlinkedModelSerializer):