diff --git a/apps/document_signatures/__init__.py b/apps/document_signatures/__init__.py index ac4eb1413e..d413453dc2 100644 --- a/apps/document_signatures/__init__.py +++ b/apps/document_signatures/__init__.py @@ -19,9 +19,8 @@ from acls.api import class_permissions from .models import DocumentVersionSignature from .permissions import ( - PERMISSION_DOCUMENT_VERIFY, - PERMISSION_SIGNATURE_UPLOAD, - PERMISSION_SIGNATURE_DOWNLOAD + PERMISSION_DOCUMENT_VERIFY, PERMISSION_SIGNATURE_UPLOAD, + PERMISSION_SIGNATURE_DOWNLOAD, PERMISSION_SIGNATURE_DELETE ) logger = logging.getLogger(__name__) @@ -82,16 +81,16 @@ def document_post_save_hook(instance): document_signature_upload = {'text': _(u'upload signature'), 'view': 'document_signature_upload', 'args': 'object.pk', 'famfam': 'pencil_add', 'permissions': [PERMISSION_SIGNATURE_UPLOAD], 'conditional_disable': has_embedded_signature} document_signature_download = {'text': _(u'download signature'), 'view': 'document_signature_download', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_SIGNATURE_DOWNLOAD], 'conditional_disable': doesnt_have_detached_signature} +document_signature_delete = {'text': _(u'delete signature'), 'view': 'document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature} document_verify = {'text': _(u'signatures'), 'view': 'document_verify', 'args': 'object.pk', 'famfam': 'text_signature', 'permissions': [PERMISSION_DOCUMENT_VERIFY]} register_links(Document, [document_verify], menu_name='form_header') -register_links(['document_verify', 'document_signature_upload', 'document_signature_download'], [document_signature_upload, document_signature_download], menu_name='sidebar') +register_links(['document_verify', 'document_signature_upload', 'document_signature_download', 'document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar') DocumentVersion.register_pre_open_hook(1, document_pre_open_hook) DocumentVersion.register_post_save_hook(1, document_post_save_hook) class_permissions(Document, [ - PERMISSION_DOCUMENT_VERIFY, - PERMISSION_SIGNATURE_UPLOAD, - PERMISSION_SIGNATURE_DOWNLOAD + PERMISSION_DOCUMENT_VERIFY, PERMISSION_SIGNATURE_UPLOAD, + PERMISSION_SIGNATURE_DOWNLOAD, PERMISSION_SIGNATURE_DELETE ]) diff --git a/apps/document_signatures/permissions.py b/apps/document_signatures/permissions.py index e4f05bc1b7..8b5653cd60 100644 --- a/apps/document_signatures/permissions.py +++ b/apps/document_signatures/permissions.py @@ -8,3 +8,4 @@ document_signatures_namespace = PermissionNamespace('document_signatures', _(u'D PERMISSION_DOCUMENT_VERIFY = Permission.objects.register(document_signatures_namespace, 'document_verify', _(u'Verify document signatures')) PERMISSION_SIGNATURE_UPLOAD = Permission.objects.register(document_signatures_namespace, 'signature_upload', _(u'Upload detached signatures')) PERMISSION_SIGNATURE_DOWNLOAD = Permission.objects.register(document_signatures_namespace, 'signature_download', _(u'Download detached signatures')) +PERMISSION_SIGNATURE_DELETE = Permission.objects.register(document_signatures_namespace, 'signature_delete', _(u'Delete detached signatures')) diff --git a/apps/document_signatures/static/images/icons/pencil_delete.png b/apps/document_signatures/static/images/icons/pencil_delete.png new file mode 100644 index 0000000000..37b9ba6efb Binary files /dev/null and b/apps/document_signatures/static/images/icons/pencil_delete.png differ diff --git a/apps/document_signatures/urls.py b/apps/document_signatures/urls.py index 37d857aa40..9843adf8dd 100644 --- a/apps/document_signatures/urls.py +++ b/apps/document_signatures/urls.py @@ -1,7 +1,8 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('document_signatures.views', - url(r'^verify/(?P\d+)/$', 'document_verify', (), 'document_verify'), - url(r'^upload/signature/(?P\d+)/$', 'document_signature_upload', (), 'document_signature_upload'), - url(r'^download/signature/(?P\d+)/$', 'document_signature_download', (), 'document_signature_download'), + url(r'^document/(?P\d+)/signature/verify/$', 'document_verify', (), 'document_verify'), + url(r'^document/(?P\d+)/signature/upload/$', 'document_signature_upload', (), 'document_signature_upload'), + url(r'^document/(?P\d+)/signature/download/$', 'document_signature_download', (), 'document_signature_download'), + url(r'^document/(?P\d+)/signature/delete/$', 'document_signature_delete', (), 'document_signature_delete'), ) diff --git a/apps/document_signatures/views.py b/apps/document_signatures/views.py index 024f59ffb4..99b3fd1ec2 100644 --- a/apps/document_signatures/views.py +++ b/apps/document_signatures/views.py @@ -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))