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

Raise PermissionDenied on single document access, show 'Selected at least 1 document' when the multidocument view is used. GL issue #240.

Browse Source
This commit is contained in:
Roberto Rosario
2015-11-01 03:06:40 -04:00
parent cbc1f12bf6
commit 750127eb92
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/metadata/tests/test_views.py
View File

@@ -48,7 +48,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
'metadata:metadata_add', args=(self.document.pk,),
data={'metadata_type': self.metadata_type.pk}
)
self.assertEqual(response.status_code, 302)
self.assertEqual(response.status_code, 403)
self.assertEqual(len(self.document.metadata.all()), 0)
@@ -151,7 +151,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
'metadata:metadata_remove', args=(self.document.pk,),
)
self.assertEqual(response.status_code, 404)
self.assertEqual(response.status_code, 403)
# Test post to metadata removal view
response = self.post(
@@ -164,7 +164,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
}, follow=True
)
self.assertEqual(response.status_code, 404)
self.assertEqual(response.status_code, 403)
self.assertEqual(len(self.document.metadata.all()), 1)

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

@@ -37,6 +37,8 @@ from .permissions import (
def metadata_edit(request, document_id=None, document_id_list=None):
if document_id:
documents = Document.objects.filter(pk=document_id)
if not documents:
raise Document.DoesNotExist
elif document_id_list:
documents = Document.objects.select_related('metadata').filter(
pk__in=document_id_list
@@ -53,7 +55,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
if not documents:
if document_id:
raise Http404
raise PermissionDenied
else:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(
@@ -183,6 +185,8 @@ def metadata_multiple_edit(request):
def metadata_add(request, document_id=None, document_id_list=None):
if document_id:
documents = Document.objects.filter(pk=document_id)
if not documents:
raise Document.DoesNotExist
elif document_id_list:
documents = Document.objects.select_related('document_type').filter(pk__in=document_id_list)
if len(set([document.document_type.pk for document in documents])) > 1:
@@ -205,12 +209,15 @@ def metadata_add(request, document_id=None, document_id_list=None):
)
if not documents:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(
request.META.get(
'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
if document_id:
raise PermissionDenied
else:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(
request.META.get(
'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
)
)
)
for document in documents:
document.add_as_recent_document_for_user(request.user)
@@ -323,6 +330,8 @@ def metadata_multiple_add(request):
def metadata_remove(request, document_id=None, document_id_list=None):
if document_id:
documents = Document.objects.filter(pk=document_id)
if not documents:
raise Document.DoesNotExist
elif document_id_list:
documents = Document.objects.select_related('metadata').filter(
pk__in=document_id_list
@@ -339,7 +348,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
if not documents:
if document_id:
raise Http404
raise PermissionDenied
else:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(