Code cleanups

This commit is contained in:
Roberto Rosario
2014-07-03 17:31:18 -04:00
parent 874eb33f0a
commit 51fc3cf5ff
3 changed files with 10 additions and 36 deletions

View File

@@ -7,13 +7,10 @@ try:
except ImportError:
from StringIO import StringIO
# from django.db.models.signals import post_save
# from django.dispatch import receiver
from acls.api import class_permissions
from documents.models import Document, DocumentVersion
from django_gpg.exceptions import GPGDecryptionError
from django_gpg.runtime import gpg
from documents.models import Document, DocumentVersion
from navigation.api import register_links
from .links import (document_signature_delete, document_signature_download,
@@ -43,36 +40,14 @@ def document_pre_open_hook(descriptor, instance):
descriptor.close()
return StringIO(result.data)
else:
# It no embedded signature pass along
# Doing this single DB lookup avoids trying to decrypt non signed
# files always, which could result in slow down for big non signed
# files
# descriptor.seek(0)
return descriptor
# try:
# result = gpg.decrypt_file(descriptor, close_descriptor=False)
# # gpg return a string, turn it into a file like object
# except GPGDecryptionError:
# # At least return the original raw content
# descriptor.seek(0)
# return descriptor
# else:
# descriptor.close()
# return StringIO(result.data)
def document_post_save_hook(instance):
if not instance.pk:
document_signature, created = DocumentVersionSignature.objects.get_or_create(
document_version=instance.latest_version,
)
# DocumentVersionSignature.objects.update_signed_state(instance.document)
# @receiver(post_save, dispatch_uid='check_document_signature_state', sender=DocumentVersion)
# def check_document_signature_state(sender, instance, **kwargs):
# if kwargs.get('created', False):
# DocumentVersionSignature.objects.signature_state(instance.document)
register_links(Document, [document_verify], menu_name='form_header')

View File

@@ -2,8 +2,8 @@ import logging
from django.db import models
from django_gpg.runtime import gpg
from django_gpg.exceptions import GPGVerificationError
from django_gpg.runtime import gpg
logger = logging.getLogger(__name__)

View File

@@ -3,22 +3,21 @@ from __future__ import absolute_import
from datetime import datetime
import logging
from django.utils.translation import ugettext_lazy as _
from django.core.exceptions import PermissionDenied
from django.conf import settings
from django.contrib import messages
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.contrib import messages
from django.utils.safestring import mark_safe
from django.conf import settings
from django.template.defaultfilters import force_escape
from django.core.exceptions import PermissionDenied
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from acls.models import AccessEntry
from filetransfers.api import serve_file
from django_gpg.api import SIGNATURE_STATES
from documents.models import Document, RecentDocument
from permissions.models import Permission
from filetransfers.api import serve_file
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_DELETE)