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

Code style updates, change lists to tuples.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-13 15:27:22 -04:00
parent 28c45bf988
commit 97bba65668
17 changed files with 133 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ class TransformationDeleteView(SingleObjectDeleteView):
def get_extra_context(self):
return {
'content_object': self.transformation.content_object,
'navigation_object_list': ['content_object', 'transformation'],
'navigation_object_list': ('content_object', 'transformation'),
'previous': reverse(
'converter:transformation_list', args=(
self.transformation.content_type.app_label,
@@ -122,10 +122,10 @@ class TransformationCreateView(SingleObjectCreateView):
def get_post_action_redirect(self):
return reverse(
'converter:transformation_list', args=[
'converter:transformation_list', args=(
self.kwargs['app_label'], self.kwargs['model'],
self.kwargs['object_id']
]
)
)
def get_queryset(self):
@@ -134,7 +134,7 @@ class TransformationCreateView(SingleObjectCreateView):
def get_extra_context(self):
return {
'content_object': self.content_object,
'navigation_object_list': ['content_object'],
'navigation_object_list': ('content_object',),
'title': _(
'Create new transformation for: %s'
) % self.content_object,
@@ -186,7 +186,7 @@ class TransformationEditView(SingleObjectEditView):
def get_extra_context(self):
return {
'content_object': self.transformation.content_object,
'navigation_object_list': ['content_object', 'transformation'],
'navigation_object_list': ('content_object', 'transformation'),
'title': _(
'Edit transformation "%(transformation)s" for: %(content_object)s'
) % {
@@ -242,6 +242,6 @@ class TransformationListView(SingleObjectListView):
],
'hide_link': True,
'hide_object': True,
'navigation_object_list': ['content_object'],
'navigation_object_list': ('content_object',),
'title': _('Transformations for: %s') % self.content_object,
}

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

@@ -105,7 +105,7 @@ def index_setup_view(request, index_pk):
context = {
'object_list': object_list,
'index': index,
'navigation_object_list': ['index'],
'navigation_object_list': ('index',),
'title': _('Tree template nodes for index: %s') % index,
'hide_object': True,
'extra_columns': [
@@ -203,7 +203,7 @@ def template_node_create(request, parent_pk):
return render_to_response('appearance/generic_form.html', {
'form': form,
'index': parent_node.index,
'navigation_object_list': ['index'],
'navigation_object_list': ('index',),
'title': _('Create child node'),
}, context_instance=RequestContext(request))
@@ -236,7 +236,7 @@ def template_node_edit(request, node_pk):
return render_to_response('appearance/generic_form.html', {
'form': form,
'index': node.index,
'navigation_object_list': ['index', 'node'],
'navigation_object_list': ('index', 'node'),
'node': node,
'title': _('Edit index template node: %s') % node,
}, context_instance=RequestContext(request))
@@ -277,7 +277,7 @@ def template_node_delete(request, node_pk):
context = {
'delete_view': True,
'index': node.index,
'navigation_object_list': ['index', 'node'],
'navigation_object_list': ('index', 'node'),
'next': next,
'node': node,
'title': _('Delete the index template node: %s?') % node,
@@ -413,6 +413,7 @@ 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,)
)
@@ -437,6 +438,7 @@ def document_index_list(request, document_id):
"""
Show a list of indexes where the current document can be found
"""
document = get_object_or_404(Document, pk=document_id)
object_list = []

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

@@ -124,7 +124,7 @@ class WorkflowInstanceDetailView(SingleObjectListView):
def get_context_data(self, **kwargs):
context = {
'hide_object': True,
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_workflow_instance().document,
'object_list': self.get_queryset(),
'title': _('Detail of workflow: %(workflow)s') % {
@@ -180,7 +180,7 @@ class WorkflowInstanceTransitionView(FormView):
context.update(
{
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_workflow_instance().document,
'submit_label': _('Submit'),
'title': _(
@@ -366,7 +366,7 @@ class SetupWorkflowStateDeleteView(SingleObjectDeleteView):
context.update(
{
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}
@@ -393,7 +393,7 @@ class SetupWorkflowStateEditView(SingleObjectEditView):
context.update(
{
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}
@@ -527,7 +527,7 @@ class SetupWorkflowTransitionDeleteView(SingleObjectDeleteView):
context.update(
{
'object': self.get_object().workflow,
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'workflow_instance': self.get_object(),
}
)
@@ -553,7 +553,7 @@ class SetupWorkflowTransitionEditView(SingleObjectEditView):
context.update(
{
'navigation_object_list': ['object', 'workflow_instance'],
'navigation_object_list': ('object', 'workflow_instance'),
'object': self.get_object().workflow,
'workflow_instance': self.get_object(),
}

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

@@ -756,7 +756,7 @@ def document_page_view(request, document_page_id):
return render_to_response('appearance/generic_form.html', {
'access_object': document_page.document,
'form': document_page_form,
'navigation_object_list': ['page'],
'navigation_object_list': ('page',),
'page': document_page,
'rotation': rotation,
'title': ' '.join([base_title, zoom_text]),
@@ -1004,7 +1004,7 @@ def document_type_filename_list(request, document_type_id):
}
],
'hide_link': True,
'navigation_object_list': ['document_type'],
'navigation_object_list': ('document_type',),
'object_list': document_type.filenames.all(),
'title': _('Filenames for document type: %s') % document_type,
}
@@ -1037,7 +1037,7 @@ def document_type_filename_edit(request, document_type_filename_id):
'document_type': document_type_filename.document_type,
'filename': document_type_filename,
'form': form,
'navigation_object_list': ['document_type', 'filename'],
'navigation_object_list': ('document_type', 'filename',),
'next': next,
'title': _('Edit filename "%(filename)s" from document type "%(document_type)s"') % {
'document_type': document_type_filename.document_type, 'filename': document_type_filename
@@ -1069,7 +1069,7 @@ def document_type_filename_delete(request, document_type_filename_id):
'document_type': document_type_filename.document_type,
'filename': document_type_filename,
'previous': previous,
'navigation_object_list': ['document_type', 'filename'],
'navigation_object_list': ('document_type', 'filename',),
'next': next,
'title': _('Delete the filename: %(filename)s, from document type "%(document_type)s"?') % {
'document_type': document_type_filename.document_type, 'filename': document_type_filename
@@ -1106,7 +1106,7 @@ def document_type_filename_create(request, document_type_id):
return render_to_response('appearance/generic_form.html', {
'document_type': document_type,
'form': form,
'navigation_object_list': ['document_type'],
'navigation_object_list': ('document_type',),
'title': _('Create filename for document type: %s') % document_type,
}, context_instance=RequestContext(request))

4
mayan/apps/installation/views.py
View File

@@ -12,7 +12,7 @@ from .permissions import permission_installation_details
def namespace_list(request):
Permission.check_permissions(
request.user, [permission_installation_details]
request.user, (permission_installation_details,)
)
return render_to_response('appearance/generic_list.html', {
@@ -24,7 +24,7 @@ def namespace_list(request):
def namespace_details(request, namespace_id):
Permission.check_permissions(
request.user, [permission_installation_details]
request.user, (permission_installation_details,)
)
namespace = PropertyNamespace.get(namespace_id)

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

@@ -82,7 +82,7 @@ class ResolvedSmartLinkView(DocumentListView):
try:
Permission.check_permissions(
request.user, [permission_document_view]
request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -91,7 +91,7 @@ class ResolvedSmartLinkView(DocumentListView):
try:
Permission.check_permissions(
request.user, [permission_smart_link_view]
request.user, (permission_smart_link_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -203,7 +203,7 @@ class DocumentSmartLinkListView(SmartLinkListView):
def smart_link_create(request):
Permission.check_permissions(
request.user, [permission_smart_link_create]
request.user, (permission_smart_link_create,)
)
if request.method == 'POST':
@@ -230,7 +230,7 @@ def smart_link_edit(request, smart_link_pk):
try:
Permission.check_permissions(
request.user, [permission_smart_link_edit]
request.user, (permission_smart_link_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -262,7 +262,7 @@ def smart_link_delete(request, smart_link_pk):
try:
Permission.check_permissions(
request.user, [permission_smart_link_delete]
request.user, (permission_smart_link_delete,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -310,11 +310,11 @@ def smart_link_condition_list(request, smart_link_pk):
try:
Permission.check_permissions(
request.user, [permission_smart_link_edit]
request.user, (permission_smart_link_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
[permission_smart_link_edit], request.user, smart_link
(permission_smart_link_edit,), request.user, smart_link
)
return render_to_response('appearance/generic_list.html', {
@@ -338,11 +338,11 @@ def smart_link_condition_create(request, smart_link_pk):
try:
Permission.check_permissions(
request.user, [permission_smart_link_edit]
request.user, (permission_smart_link_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
[permission_smart_link_edit], request.user, smart_link
(permission_smart_link_edit,), request.user, smart_link
)
if request.method == 'POST':
@@ -378,11 +378,11 @@ def smart_link_condition_edit(request, smart_link_condition_pk):
try:
Permission.check_permissions(
request.user, [permission_smart_link_edit]
request.user, (permission_smart_link_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
[permission_smart_link_edit], request.user,
(permission_smart_link_edit,), request.user,
smart_link_condition.smart_link
)
@@ -407,7 +407,7 @@ def smart_link_condition_edit(request, smart_link_condition_pk):
return render_to_response('appearance/generic_form.html', {
'condition': smart_link_condition,
'form': form,
'navigation_object_list': ['object', 'condition'],
'navigation_object_list': ('object', 'condition'),
'next': next,
'object': smart_link_condition.smart_link,
'previous': previous,
@@ -421,10 +421,12 @@ def smart_link_condition_delete(request, smart_link_condition_pk):
)
try:
Permission.check_permissions(request.user, [permission_smart_link_edit])
Permission.check_permissions(
request.user, (permission_smart_link_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
[permission_smart_link_edit], request.user,
(permission_smart_link_edit,), request.user,
smart_link_condition.smart_link
)
@@ -454,7 +456,7 @@ def smart_link_condition_delete(request, smart_link_condition_pk):
return render_to_response('appearance/generic_confirm.html', {
'condition': smart_link_condition,
'delete_view': True,
'navigation_object_list': ['object', 'condition'],
'navigation_object_list': ('object', 'condition'),
'next': next,
'object': smart_link_condition.smart_link,
'previous': previous,

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

@@ -46,7 +46,7 @@ def send_document_link(request, document_id=None, document_id_list=None, as_atta
permission = permission_mailing_link
try:
Permission.check_permissions(request.user, [permission])
Permission.check_permissions(request.user, (permission,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(permission, request.user, documents)

32
mayan/apps/metadata/api_views.py
View File

@@ -34,8 +34,8 @@ class APIMetadataTypeListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)
filter_backends = (MayanObjectPermissionsFilter,)
mayan_object_permissions = {'GET': [permission_metadata_type_view]}
mayan_view_permissions = {'POST': [permission_metadata_type_create]}
mayan_object_permissions = {'GET': (permission_metadata_type_view,)}
mayan_view_permissions = {'POST': (permission_metadata_type_create,)}
def get(self, *args, **kwargs):
"""
@@ -56,10 +56,10 @@ class APIMetadataTypeView(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MayanPermission,)
mayan_object_permissions = {
'GET': [permission_metadata_type_view],
'PUT': [permission_metadata_type_edit],
'PATCH': [permission_metadata_type_edit],
'DELETE': [permission_metadata_type_delete]
'GET': (permission_metadata_type_view,),
'PUT': (permission_metadata_type_edit,),
'PATCH': (permission_metadata_type_edit,),
'DELETE': (permission_metadata_type_delete,)
}
def delete(self, *args, **kwargs):
@@ -102,7 +102,7 @@ class APIDocumentMetadataListView(generics.ListCreateAPIView):
# this document
try:
Permission.check_permissions(
self.request.user, [permission_metadata_document_view]
self.request.user, (permission_metadata_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -116,7 +116,7 @@ class APIDocumentMetadataListView(generics.ListCreateAPIView):
# document
try:
Permission.check_permissions(
self.request.user, [permission_metadata_document_add]
self.request.user, (permission_metadata_document_add,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -148,10 +148,10 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MayanPermission,)
mayan_object_permissions = {
'GET': [permission_metadata_document_view],
'PUT': [permission_metadata_document_edit],
'PATCH': [permission_metadata_document_edit],
'DELETE': [permission_metadata_document_remove]
'GET': (permission_metadata_document_view,),
'PUT': (permission_metadata_document_edit,),
'PATCH': (permission_metadata_document_edit,),
'DELETE': (permission_metadata_document_remove,)
}
def delete(self, *args, **kwargs):
@@ -207,7 +207,7 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView):
class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)
mayan_view_permissions = {'POST': [permission_document_type_edit]}
mayan_view_permissions = {'POST': (permission_document_type_edit,)}
required_metadata = False
@@ -217,7 +217,7 @@ class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
)
try:
Permission.check_permissions(
self.request.user, [permission_document_type_view]
self.request.user, (permission_document_type_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -251,7 +251,7 @@ class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
try:
Permission.check_permissions(
self.request.user, [permission_document_type_edit]
self.request.user, (permission_document_type_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -305,7 +305,7 @@ class APIDocumentTypeMetadataTypeRequiredView(views.APIView):
)
try:
Permission.check_permissions(
self.request.user, [permission_document_type_edit]
self.request.user, (permission_document_type_edit,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

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

@@ -59,7 +59,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
try:
Permission.check_permissions(
request.user, [permission_metadata_document_edit]
request.user, (permission_metadata_document_edit,)
)
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
@@ -214,7 +214,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
try:
Permission.check_permissions(
request.user, [permission_metadata_document_add]
request.user, (permission_metadata_document_add,)
)
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
@@ -343,7 +343,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
try:
Permission.check_permissions(
request.user, [permission_metadata_document_remove]
request.user, (permission_metadata_document_remove,)
)
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
@@ -478,7 +478,7 @@ def metadata_view(request, document_id):
try:
Permission.check_permissions(
request.user, [permission_metadata_document_view]
request.user, (permission_metadata_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

6
mayan/apps/ocr/api_views.py
View File

@@ -22,7 +22,9 @@ class DocumentVersionOCRView(generics.GenericAPIView):
permission_classes = (MayanPermission,)
def post(self, request, *args, **kwargs):
"""Submit document version for OCR."""
"""
Submit document version for OCR.
"""
serializer = self.get_serializer(
data=request.DATA, files=request.FILES
@@ -35,7 +37,7 @@ class DocumentVersionOCRView(generics.GenericAPIView):
try:
Permission.check_permissions(
request.user, [permission_ocr_document]
request.user, (permission_ocr_document,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

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

@@ -34,7 +34,7 @@ class DocumentSubmitView(ConfirmView):
try:
Permission.check_permissions(
request.user, [permission_ocr_document]
request.user, (permission_ocr_document,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -116,7 +116,7 @@ def document_content(request, document_id):
try:
Permission.check_permissions(
request.user, [permission_ocr_content_view]
request.user, (permission_ocr_content_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -138,7 +138,7 @@ def document_content(request, document_id):
def entry_list(request):
Permission.check_permissions(request.user, [permission_ocr_document])
Permission.check_permissions(request.user, (permission_ocr_document,))
context = {
'object_list': DocumentVersionOCRError.objects.all(),
@@ -146,13 +146,15 @@ def entry_list(request):
'hide_object': True,
}
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)
)
def entry_delete(request, pk=None, pk_list=None):
Permission.check_permissions(
request.user, [permission_ocr_document_delete]
request.user, (permission_ocr_document_delete,)
)
if pk:
@@ -207,8 +209,10 @@ def entry_delete(request, pk=None, pk_list=None):
len(entries)
)
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)
)
def entry_delete_multiple(request):
@@ -216,7 +220,7 @@ def entry_delete_multiple(request):
def entry_re_queue(request, pk=None, pk_list=None):
Permission.check_permissions(request.user, [permission_ocr_document])
Permission.check_permissions(request.user, (permission_ocr_document,))
if pk:
entries = [get_object_or_404(DocumentVersionOCRError, pk=pk)]
@@ -257,8 +261,10 @@ def entry_re_queue(request, pk=None, pk_list=None):
len(entries)
)
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)
)
def entry_re_queue_multiple(request):

42
mayan/apps/permissions/api_views.py
View File

@@ -19,15 +19,21 @@ class APIRoleListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)
filter_backends = (MayanObjectPermissionsFilter,)
mayan_object_permissions = {'GET': [permission_role_view]}
mayan_view_permissions = {'POST': [permission_role_create]}
mayan_object_permissions = {'GET': (permission_role_view,)}
mayan_view_permissions = {'POST': (permission_role_create,)}
def get(self, *args, **kwargs):
"""Returns a list of all the roles."""
"""
Returns a list of all the roles.
"""
return super(APIRoleListView, self).get(*args, **kwargs)
def post(self, *args, **kwargs):
"""Create a new role."""
"""
Create a new role.
"""
return super(APIRoleListView, self).post(*args, **kwargs)
@@ -37,24 +43,36 @@ class APIRoleView(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MayanPermission,)
mayan_object_permissions = {
'GET': [permission_role_view],
'PUT': [permission_role_edit],
'PATCH': [permission_role_edit],
'DELETE': [permission_role_delete]
'GET': (permission_role_view,),
'PUT': (permission_role_edit,),
'PATCH': (permission_role_edit,),
'DELETE': (permission_role_delete,)
}
def delete(self, *args, **kwargs):
"""Delete the selected role."""
"""
Delete the selected role.
"""
return super(APIRoleView, self).delete(*args, **kwargs)
def get(self, *args, **kwargs):
"""Return the details of the selected role."""
"""
Return the details of the selected role.
"""
return super(APIRoleView, self).get(*args, **kwargs)
def patch(self, *args, **kwargs):
"""Edit the selected role."""
"""
Edit the selected role.
"""
return super(APIRoleView, self).patch(*args, **kwargs)
def put(self, *args, **kwargs):
"""Edit the selected role."""
"""
Edit the selected role.
"""
return super(APIRoleView, self).put(*args, **kwargs)

6
mayan/apps/sources/views.py
View File

@@ -78,7 +78,7 @@ class SourceLogListView(ParentChildListView):
def document_create_siblings(request, document_id):
Permission.check_permissions(request.user, [permission_document_create])
Permission.check_permissions(request.user, (permission_document_create,))
document = get_object_or_404(Document, pk=document_id)
query_dict = {}
@@ -206,7 +206,7 @@ class UploadInteractiveView(UploadBaseView):
self.subtemplates_list = []
Permission.check_permissions(
request.user, [permission_document_create]
request.user, (permission_document_create,)
)
self.document_type = get_object_or_404(
@@ -311,7 +311,7 @@ class UploadInteractiveVersionView(UploadBaseView):
self.document = get_object_or_404(Document, pk=kwargs['document_pk'])
try:
Permission.check_permissions(
self.request.user, [permission_document_new_version]
self.request.user, (permission_document_new_version,)
)
except PermissionDenied:
AccessControlList.objects.check_access(

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

@@ -45,7 +45,7 @@ class StatisticExecute(SimpleView):
return {
'hide_link': True,
'namespace': statictic.namespace,
'navigation_object_list': ['namespace', 'object'],
'navigation_object_list': ('namespace', 'object'),
'object': statictic,
'object_list': statictic.get_results(),
'title': _('Results for: %s') % statictic,

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

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

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

@@ -56,7 +56,7 @@ def tag_attach(request, document_id=None, document_id_list=None):
)
try:
Permission.check_permissions(request.user, [permission_tag_attach])
Permission.check_permissions(request.user, (permission_tag_attach,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
permission_tag_attach, request.user, documents
@@ -129,7 +129,7 @@ class TagListView(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
@@ -183,7 +183,7 @@ def tag_delete(request, tag_id=None, tag_id_list=None):
)
try:
Permission.check_permissions(request.user, [permission_tag_delete])
Permission.check_permissions(request.user, (permission_tag_delete,))
except PermissionDenied:
tags = AccessControlList.objects.filter_by_access(
permission_tag_delete, request.user, tags
@@ -269,7 +269,7 @@ class DocumentTagListView(TagListView):
try:
Permission.check_permissions(
request.user, [permission_document_view]
request.user, (permission_document_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
@@ -319,7 +319,7 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta
)
try:
Permission.check_permissions(request.user, [permission_tag_remove])
Permission.check_permissions(request.user, (permission_tag_remove,))
except PermissionDenied:
documents = AccessControlList.objects.filter_by_access(
permission_tag_remove, request.user, documents

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

@@ -71,7 +71,7 @@ class UserListView(SingleObjectListView):
def user_edit(request, user_id):
Permission.check_permissions(request.user, [permission_user_edit])
Permission.check_permissions(request.user, (permission_user_edit,))
user = get_object_or_404(User, pk=user_id)
if user.is_superuser or user.is_staff:
@@ -104,7 +104,7 @@ def user_edit(request, user_id):
def user_add(request):
Permission.check_permissions(request.user, [permission_user_create])
Permission.check_permissions(request.user, (permission_user_create,))
if request.method == 'POST':
form = UserForm(request.POST)
@@ -128,7 +128,7 @@ def user_add(request):
def user_delete(request, user_id=None, user_id_list=None):
Permission.check_permissions(request.user, [permission_user_delete])
Permission.check_permissions(request.user, (permission_user_delete,))
post_action_redirect = None
if user_id:
@@ -186,7 +186,7 @@ def user_multiple_delete(request):
def user_set_password(request, user_id=None, user_id_list=None):
Permission.check_permissions(request.user, [permission_user_edit])
Permission.check_permissions(request.user, (permission_user_edit,))
post_action_redirect = None
if user_id:
@@ -323,7 +323,7 @@ class GroupListView(SingleObjectListView):
def group_delete(request, group_id=None, group_id_list=None):
Permission.check_permissions(request.user, [permission_group_delete])
Permission.check_permissions(request.user, (permission_group_delete,))
post_action_redirect = None
if group_id:
@@ -361,8 +361,10 @@ def group_delete(request, group_id=None, group_id_list=None):
elif len(groups) > 1:
context['title'] = _('Delete the groups: %s?') % ', '.join([unicode(d) for d in groups])
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)
)
def group_multiple_delete(request):