Update view to new form definition
This commit is contained in:
@@ -6,7 +6,6 @@ from django.shortcuts import render_to_response, get_object_or_404
|
|||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
#from django.utils.html import mark_safe
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from documents.views import document_list
|
from documents.views import document_list
|
||||||
@@ -52,21 +51,19 @@ def checkout_document(request, document_pk):
|
|||||||
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_CHECKOUT, request.user, document)
|
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_CHECKOUT, request.user, document)
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = DocumentCheckoutForm(data=request.POST)
|
form = DocumentCheckoutForm(data=request.POST, initial={'document': document})
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
try:
|
try:
|
||||||
document_checkout = form.save(commit=False)
|
document_checkout = form.save()
|
||||||
document_checkout.document = document
|
|
||||||
document_checkout.save()
|
|
||||||
except DocumentAlreadyCheckedOut:
|
except DocumentAlreadyCheckedOut:
|
||||||
messages.error(request, _(u'Document already checked out.'))
|
messages.error(request, _(u'Document already checked out.'))
|
||||||
except Exception, exc:
|
except Exception, exc:
|
||||||
messages.error(request, _(u'Error trying to check out document; %s') % exc)
|
messages.error(request, _(u'Error trying to check out document; %s') % exc)
|
||||||
else:
|
else:
|
||||||
messages.success(request, _(u'Document "%s" checked out successfully.') % document)
|
messages.success(request, _(u'Document "%s" checked out successfully.') % document)
|
||||||
return HttpResponseRedirect(document_checkout.get_absolute_url())
|
return HttpResponseRedirect(reverse('checkout_info', args=[document.pk]))
|
||||||
else:
|
else:
|
||||||
form = DocumentCheckoutForm()
|
form = DocumentCheckoutForm(initial={'document': document})
|
||||||
|
|
||||||
return render_to_response('generic_form.html', {
|
return render_to_response('generic_form.html', {
|
||||||
'form': form,
|
'form': form,
|
||||||
|
|||||||
Reference in New Issue
Block a user