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

Update the folder_document_multiple_remove, folder_add_document, folder_add_multiple_documents views to use queryset instead of list of objects. Improve folder app views tests.

Browse Source
This commit is contained in:
Roberto Rosario
2015-10-22 00:17:39 -04:00
parent f1069fad74
commit b02cee1759
2 changed files with 207 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
mayan/apps/folders/tests/test_views.py
View File

@@ -8,6 +8,7 @@ from django.test.client import Client
from django.test import TestCase
from documents.models import DocumentType
from documents.permissions import permission_document_view
from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
from documents.tests.test_views import GenericDocumentViewTestCase
from permissions import Permission
@@ -19,36 +20,71 @@ from user_management.tests import (
)
from ..models import Folder
from ..permissions import permission_folder_remove_document
from ..permissions import (
permission_folder_add_document, permission_folder_create,
permission_folder_delete, permission_folder_edit,
permission_folder_remove_document, permission_folder_view
)
from .literals import TEST_FOLDER_LABEL, TEST_FOLDER_EDITED_LABEL
class FolderViewTestCase(GenericDocumentViewTestCase):
def test_folder_create_view(self):
def test_folder_create_view_no_permission(self):
logged_in = self.client.login(
username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
response = self.client.post(
reverse('folders:folder_create'), data={
'label': TEST_FOLDER_LABEL
}
)
self.assertEquals(response.status_code, 403)
self.assertEqual(Folder.objects.count(), 0)
def test_folder_create_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_create.stored_permission
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
response = self.client.post(
reverse('folders:folder_create'), data={
'label': TEST_FOLDER_LABEL
}, follow=True
)
self.assertContains(response, text='created', status_code=200)
self.assertEqual(Folder.objects.count(), 1)
self.assertEqual(Folder.objects.first().label, TEST_FOLDER_LABEL)
self.assertEqual(Folder.objects.first().user, self.admin_user)
self.assertEqual(Folder.objects.first().user, self.user)
def test_folder_delete_view(self):
def test_folder_delete_view_no_permission(self):
logged_in = self.client.login(
username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
)
response = self.client.post(
reverse('folders:folder_delete', args=(folder.pk,))
)
self.assertEqual(response.status_code, 403)
self.assertEqual(Folder.objects.count(), 1)
def test_folder_delete_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_delete.stored_permission
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
@@ -61,19 +97,39 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
self.assertContains(response, text='deleted', status_code=200)
self.assertEqual(Folder.objects.count(), 0)
def test_folder_edit_view(self):
def test_folder_edit_view_no_permission(self):
logged_in = self.client.login(
username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
label=TEST_FOLDER_LABEL, user=self.user
)
response = self.client.post(
reverse('folders:folder_edit', args=(folder.pk,)), data = {
reverse('folders:folder_edit', args=(folder.pk,)), data={
'label': TEST_FOLDER_EDITED_LABEL
}
)
self.assertEqual(response.status_code, 403)
folder = Folder.objects.get(pk=folder.pk)
self.assertEqual(folder.label, TEST_FOLDER_LABEL)
def test_folder_edit_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_edit.stored_permission
)
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.user
)
response = self.client.post(
reverse('folders:folder_edit', args=(folder.pk,)), data={
'label': TEST_FOLDER_EDITED_LABEL
}, follow=True
)
@@ -81,14 +137,15 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
folder = Folder.objects.get(pk=folder.pk)
self.assertContains(response, text='saved', status_code=200)
self.assertEqual(folder.label, TEST_FOLDER_EDITED_LABEL)
self.assertEqual(folder.user, self.admin_user)
def test_folder_add_document_view(self):
def test_folder_add_document_view_no_permission(self):
logged_in = self.client.login(
username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_view.stored_permission
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
@@ -98,6 +155,38 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
reverse('folders:folder_add_document', args=(self.document.pk,)),
data={
'folder': folder.pk,
}
)
self.assertEqual(response.status_code, 302)
self.assertEqual(folder.documents.count(), 0)
def test_folder_add_document_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_view.stored_permission
)
self.role.permissions.add(
permission_folder_add_document.stored_permission
)
self.role.permissions.add(
permission_document_view.stored_permission
)
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
)
response = self.client.post(
reverse(
'folders:folder_add_document', args=(self.document.pk,)
), data={
'folder': folder.pk,
}, follow=True
)
@@ -108,12 +197,40 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
folder.documents.all(), (repr(self.document),)
)
def test_folder_add_multiple_documents_view(self):
def test_folder_add_multiple_documents_view_no_permission(self):
logged_in = self.client.login(
username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_view.stored_permission
)
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
)
response = self.client.post(
reverse('folders:folder_add_multiple_documents'), data={
'id_list': (self.document.pk,),
'folder': folder.pk
}
)
self.assertEqual(response.status_code, 302)
self.assertEqual(folder.documents.count(), 0)
def test_folder_add_multiple_documents_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_view.stored_permission
)
self.role.permissions.add(
permission_folder_add_document.stored_permission
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user
@@ -133,15 +250,13 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
folder.documents.all(), (repr(self.document),)
)
def test_folder_remove_document_view(self):
def test_folder_remove_document_view_no_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.admin_user,
label=TEST_FOLDER_LABEL, user=self.user,
)
folder.documents.add(self.document)
@@ -161,7 +276,21 @@ class FolderViewTestCase(GenericDocumentViewTestCase):
folder = Folder.objects.get(pk=folder.pk)
self.assertEqual(folder.documents.count(), 1)
self.role.permissions.add(permission_folder_remove_document.stored_permission)
def test_folder_remove_document_view_with_permission(self):
logged_in = self.client.login(
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD
)
self.role.permissions.add(
permission_folder_remove_document.stored_permission
)
folder = Folder.objects.create(
label=TEST_FOLDER_LABEL, user=self.user
)
folder.documents.add(self.document)
self.assertEqual(folder.documents.count(), 1)
response = self.client.post(
reverse(

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

@@ -158,21 +158,32 @@ class FolderDetailView(DocumentListView):
def folder_add_document(request, document_id=None, document_id_list=None):
if document_id:
documents = [get_object_or_404(Document, pk=document_id)]
queryset = Document.objects.filter(pk=document_id)
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else:
queryset = Document.objects.filter(pk__in=document_id_list)
if not queryset:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
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)
queryset = AccessControlList.objects.filter_by_access(
permission_folder_add_document, request.user, queryset
)
post_action_redirect = None
if document_id:
post_action_redirect = reverse('folders:document_folder_list', args=(document_id,))
post_action_redirect = reverse(
'folders:document_folder_list', args=(document_id,)
)
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))))
@@ -181,14 +192,26 @@ def folder_add_document(request, document_id=None, document_id_list=None):
form = FolderListForm(request.POST, user=request.user)
if form.is_valid():
folder = form.cleaned_data['folder']
for document in documents:
for document in queryset:
if document.pk not in folder.documents.values_list('pk', flat=True):
folder.documents.add(document)
messages.success(request, _('Document: %(document)s added to folder: %(folder)s successfully.') % {
'document': document, 'folder': folder})
messages.success(
request, _(
'Document: %(document)s added to folder: '
'%(folder)s successfully.'
) % {
'document': document, 'folder': folder
}
)
else:
messages.warning(request, _('Document: %(document)s is already in folder: %(folder)s.') % {
'document': document, 'folder': folder})
messages.warning(
request, _(
'Document: %(document)s is already in '
'folder: %(folder)s.'
) % {
'document': document, 'folder': folder
}
)
return HttpResponseRedirect(next)
else:
@@ -200,13 +223,13 @@ def folder_add_document(request, document_id=None, document_id_list=None):
'next': next,
}
if len(documents) == 1:
context['object'] = documents[0]
if queryset.count() == 1:
context['object'] = queryset.first()
context['title'] = ungettext(
'Add document to folder',
'Add documents to folder',
len(documents)
queryset.count()
)
return render_to_response(
@@ -308,10 +331,16 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis
def folder_document_multiple_remove(request, folder_id):
return folder_document_remove(request, folder_id, document_id_list=request.GET.get('id_list', request.POST.get('id_list', [])))
return folder_document_remove(
request, folder_id, document_id_list=request.GET.get(
'id_list', request.POST.get('id_list', '')
).split(',')
)
def folder_add_multiple_documents(request):
return folder_add_document(
request, document_id_list=request.GET.get('id_list', request.POST.get('id_list', []))
request, document_id_list=request.GET.get(
'id_list', request.POST.get('id_list', '')
).split(',')
)