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

Clean up (unused imports, PEP8, etc)

Browse Source
This commit is contained in:
Roberto Rosario
2012-06-08 16:43:54 -04:00
parent c24a3f935e
commit 58f027db60
34 changed files with 121 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/documents/__init__.py
View File

@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
from common.utils import validate_path, encapsulate
from navigation.api import (bind_links, register_top_menu,
register_model_list_columns, register_multi_item_links,
register_model_list_columns,
register_sidebar_template, Link)
from main.api import register_diagnostic, register_maintenance_links
from history.api import register_history_type
@@ -17,32 +17,26 @@ from acls.api import class_permissions
from .models import (Document, DocumentPage,
DocumentPageTransformation, DocumentType, DocumentTypeFilename,
DocumentVersion)
from .permissions import (PERMISSION_DOCUMENT_CREATE,
PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_VIEW,
PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD,
PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS,
from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE,
PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW,
PERMISSION_DOCUMENT_NEW_VERSION)
from .literals import (HISTORY_DOCUMENT_CREATED,
HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED)
from .conf.settings import ZOOM_MAX_LEVEL
from .conf.settings import ZOOM_MIN_LEVEL
from .conf import settings as document_settings
from .widgets import document_thumbnail
from .links import (document_list, document_list_recent, document_create_multiple,
document_create_siblings, document_view_simple, document_view_advanced,
document_delete, document_multiple_delete, document_edit, document_preview,
document_download, document_multiple_download, document_version_download,
document_delete, document_edit, document_download, document_version_download,
document_find_duplicates, document_find_all_duplicates,
document_update_page_count, document_clear_transformations,
document_multiple_clear_transformations, document_print, document_history_view,
document_print, document_history_view,
document_missing_list)
from .links import (document_type_list, document_type_setup, document_type_document_list,
document_type_edit, document_type_delete, document_type_create, document_type_filename_list,
document_type_filename_create, document_type_filename_edit, document_type_filename_delete)
from .links import document_version_list, document_version_revert
from .links import document_version_list, document_version_revert
from .links import (document_page_transformation_list, document_page_transformation_create,
document_page_transformation_edit, document_page_transformation_delete,
document_page_view, document_page_text, document_page_edit, document_page_navigation_next,

1
apps/documents/conf/settings.py
View File

@@ -10,6 +10,7 @@ from django.conf import settings
from storage.backends.filebasedstorage import FileBasedStorage
from smart_settings.api import Setting, SettingNamespace
def default_checksum(x):
"""hashlib.sha256(x).hexdigest()"""
return hashlib.sha256(x).hexdigest()

10
apps/documents/forms.py
View File

@@ -166,7 +166,7 @@ class DocumentForm(forms.ModelForm):
initial=False,
required=False,
)
# Instance's document_type overrides the passed document_type
if hasattr(instance, 'document_type'):
document_type = instance.document_type
@@ -308,15 +308,13 @@ class DocumentTypeFilenameForm_create(forms.ModelForm):
model = DocumentTypeFilename
fields = ('filename',)
class DocumentDownloadForm(forms.Form):
compressed = forms.BooleanField(label=_(u'Compress'), required=False, help_text=_(u'Download the document in the original format or in a compressed manner. This option is selectable only when downloading one document, for multiple documents, the bundle will always be downloads as a compressed file.'))
def __init__(self, *args, **kwargs):
self.document_versions = kwargs.pop('document_versions', None)
super(DocumentDownloadForm, self).__init__(*args, **kwargs)
if len(self.document_versions) > 1:
self.fields['compressed'].initial = True
self.fields['compressed'].widget.attrs.update({'disabled': True})
self.fields['compressed'].widget.attrs.update({'disabled': True})

12
apps/documents/links.py
View File

@@ -2,9 +2,7 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from navigation.api import (bind_links, register_top_menu,
register_model_list_columns, register_multi_item_links,
register_sidebar_template, Link)
from navigation.api import Link
from history.permissions import PERMISSION_HISTORY_VIEW
from .permissions import (PERMISSION_DOCUMENT_CREATE,
@@ -13,12 +11,12 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS,
PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE,
PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW,
PERMISSION_DOCUMENT_NEW_VERSION)
PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW)
from .conf.settings import ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
# Document page links expressions
# Document page links expressions
def is_first_page(context):
return context['page'].page_number <= 1
@@ -101,4 +99,4 @@ document_type_filename_edit = Link(text=_(u'edit'), view='document_type_filename
document_type_filename_delete = Link(text=_(u'delete'), view='document_type_filename_delete', args='filename.id', sprite='database_delete', permissions=[PERMISSION_DOCUMENT_TYPE_EDIT])
# TODO: remove this
document_type_views=['setup_document_type_metadata', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete', 'document_type_create', 'document_type_filename_list', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_delete']
document_type_views = ['setup_document_type_metadata', 'document_type_list', 'document_type_document_list', 'document_type_edit', 'document_type_delete', 'document_type_create', 'document_type_filename_list', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_delete']

5
apps/documents/models.py
View File

@@ -280,7 +280,7 @@ class Document(models.Model):
@property
def content(self):
return self.latest_version.content
def get_content(self, *args, **kwargs):
return self.latest_version.get_content(*args, **kwargs)
@@ -294,7 +294,6 @@ class Document(models.Model):
def extension_split(self):
filename, extension = os.path.splitext(self.filename)
return filename, extension[1:]
class DocumentVersion(models.Model):
@@ -537,7 +536,7 @@ class DocumentVersion(models.Model):
return self.file.storage.size(self.file.path)
else:
return None
def rename(self, new_name):
name, extension = os.path.splitext(self.filename)
self.filename = u''.join([new_name, extension])

1
apps/documents/utils.py
View File

@@ -2,6 +2,7 @@ import os
from common.conf.settings import TEMPORARY_DIRECTORY
def document_save_to_temp_dir(document, filename, buffer_size=1024 * 1024):
temporary_path = os.path.join(TEMPORARY_DIRECTORY, filename)
return document.save_to_file(temporary_path, buffer_size)

6
apps/documents/views.py
View File

@@ -262,7 +262,7 @@ def document_edit(request, document_id):
document.filename = new_filename
document.description = form.cleaned_data['description']
document.save()
create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])})
RecentDocument.objects.add_document_for_user(request.user, document)
@@ -385,8 +385,8 @@ def document_download(request, document_id=None, document_id_list=None, document
raise
else:
messages.error(request, e)
return HttpResponseRedirect(request.META['HTTP_REFERER'])
return HttpResponseRedirect(request.META['HTTP_REFERER'])
else:
form = DocumentDownloadForm(document_versions=document_versions)