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

Add detached signature delete view

Browse Source
This commit is contained in:
Roberto Rosario
2012-03-14 22:17:45 -04:00
parent b513730978
commit a359a171d3
5 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/document_signatures/views.py
View File

@@ -21,7 +21,7 @@ from acls.models import AccessEntry
from django_gpg.api import SIGNATURE_STATES
from . import (PERMISSION_DOCUMENT_VERIFY, PERMISSION_SIGNATURE_UPLOAD,
PERMISSION_SIGNATURE_DOWNLOAD)
PERMISSION_SIGNATURE_DOWNLOAD, PERMISSION_SIGNATURE_DELETE)
from .forms import DetachedSignatureForm
from .models import DocumentVersionSignature
@@ -95,15 +95,15 @@ def document_signature_upload(request, document_pk):
DocumentVersionSignature.objects.add_detached_signature(document, request.FILES['file'])
messages.success(request, _(u'Detached signature uploaded successfully.'))
return HttpResponseRedirect(next)
except Exception, msg:
messages.error(request, msg)
except Exception, exc:
messages.error(request, exc)
return HttpResponseRedirect(previous)
else:
form = DetachedSignatureForm()
return render_to_response('generic_form.html', {
'title': _(u'Upload detached signature for: %s') % document,
'form_icon': 'key_delete.png',
'submit_label': _(u'Submit'),
'next': next,
'form': form,
'previous': previous,
@@ -133,3 +133,36 @@ def document_signature_download(request, document_pk):
return HttpResponseRedirect(request.META['HTTP_REFERER'])
return HttpResponseRedirect(request.META['HTTP_REFERER'])
def document_signature_delete(request, document_pk):
document = get_object_or_404(Document, pk=document_pk)
try:
Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_DELETE])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DELETE, request.user, document)
RecentDocument.objects.add_document_for_user(request.user, document)
post_action_redirect = None
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/')))
if request.method == 'POST':
try:
DocumentVersionSignature.objects.clear_detached_signature(document)
messages.success(request, _(u'Detached signature deleted successfully.'))
return HttpResponseRedirect(next)
except Exception, exc:
messages.error(request, _(u'Error while deleting the detached signature; %s') % exc)
return HttpResponseRedirect(previous)
return render_to_response('generic_confirm.html', {
'title': _(u'Are you sure you wish to delete the detached signature from document: %s') % document,
'form_icon': 'pencil_delete.png',
'next': next,
'previous': previous,
'object': document,
'delete_view': True,
}, context_instance=RequestContext(request))