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

Remove validation from the form and views

Browse Source
This commit is contained in:
Roberto Rosario
2014-11-04 17:37:05 -04:00
parent e6dbb4cd70
commit 1287cca3ac
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mayan/apps/checkouts/forms.py
View File

@@ -2,7 +2,6 @@ from __future__ import absolute_import
from django import forms
from .exceptions import DocumentAlreadyCheckedOut
from .models import DocumentCheckout
from .widgets import SplitTimeDeltaField
@@ -12,14 +11,4 @@ class DocumentCheckoutForm(forms.ModelForm):
class Meta:
model = DocumentCheckout
exclude = ('checkout_datetime', 'user_content_type', 'user_object_id')
widgets = {
'document': forms.widgets.HiddenInput(),
}
def clean_document(self):
document = self.cleaned_data['document']
if document.is_checked_out():
raise DocumentAlreadyCheckedOut
return document
exclude = ('document', 'checkout_datetime', 'user_content_type', 'user_object_id')

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

@@ -72,20 +72,20 @@ def checkout_document(request, document_pk):
if request.method == 'POST':
form = DocumentCheckoutForm(data=request.POST, initial={'document': document})
try:
if form.is_valid():
try:
document_checkout = form.save(commit=False)
document_checkout.user_object = request.user
document_checkout.save()
except Exception as exception:
messages.error(request, _(u'Error trying to check out document; %s') % exception)
else:
messages.success(request, _(u'Document "%s" checked out successfully.') % document)
return HttpResponseRedirect(reverse('checkouts:checkout_info', args=[document.pk]))
except DocumentAlreadyCheckedOut:
messages.error(request, _(u'Document already checked out.'))
return HttpResponseRedirect(reverse('checkouts:checkout_info', args=[document.pk]))
if form.is_valid():
try:
document_checkout = form.save(commit=False)
document_checkout.user_object = request.user
document_checkout.document = document
document_checkout.save()
except DocumentAlreadyCheckedOut:
messages.error(request, _(u'Document already checked out.'))
return HttpResponseRedirect(reverse('checkouts:checkout_info', args=[document.pk]))
except Exception as exception:
messages.error(request, _(u'Error trying to check out document; %s') % exception)
else:
messages.success(request, _(u'Document "%s" checked out successfully.') % document)
return HttpResponseRedirect(reverse('checkouts:checkout_info', args=[document.pk]))
else:
form = DocumentCheckoutForm(initial={'document': document})
@@ -100,6 +100,13 @@ def checkin_document(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
post_action_redirect = reverse('checkouts:checkout_info', args=[document.pk])
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home'))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse('main:home'))))
if not document.is_checked_out():
messages.error(request, _(u'Document has not been checked out.'))
return HttpResponseRedirect(previous)
# If the user trying to check in the document is the same as the check out
# user just check for the normal permission otherwise check for the forceful
# checkin permission
@@ -114,9 +121,6 @@ def checkin_document(request, document_pk):
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_CHECKIN_OVERRIDE, request.user, document)
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home'))))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse('main:home'))))
if request.method == 'POST':
try:
document.check_in(user=request.user)