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

PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-18 14:37:15 -04:00
parent ad59734460
commit 970cb74d35
62 changed files with 365 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/metadata/__init__.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _

2
apps/metadata/admin.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.contrib import admin

28
apps/metadata/api.py
View File

@@ -1,5 +1,5 @@
'''Metadata handling commonalities'''
from __future__ import absolute_import
"""Metadata handling commonalities"""
from __future__ import absolute_import
from urllib import unquote_plus
@@ -9,9 +9,9 @@ from .models import DocumentMetadata, MetadataType
def decode_metadata_from_url(url_dict):
'''
"""
Parse a URL query string to a list of metadata
'''
"""
metadata_dict = {
'id': {},
'value': {}
@@ -35,19 +35,19 @@ def decode_metadata_from_url(url_dict):
def save_metadata_list(metadata_list, document, create=False):
'''
"""
Take a list of metadata dictionaries and associate them to a
document
'''
"""
for item in metadata_list:
save_metadata(item, document, create)
def save_metadata(metadata_dict, document, create=False):
'''
"""
Take a dictionary of metadata type & value and associate it to a
document
'''
"""
if create:
# Use matched metadata now to create document metadata
document_metadata, created = DocumentMetadata.objects.get_or_create(
@@ -81,16 +81,16 @@ def save_metadata(metadata_dict, document, create=False):
def metadata_repr(metadata_list):
'''
"""
Return a printable representation of a metadata list
'''
"""
return u', '.join(metadata_repr_as_list(metadata_list))
def metadata_repr_as_list(metadata_list):
'''
"""
Turn a list of metadata into a list of printable representations
'''
"""
output = []
for metadata_dict in metadata_list:
try:
@@ -103,7 +103,7 @@ def metadata_repr_as_list(metadata_list):
def get_metadata_string(document):
'''
"""
Return a formated representation of a document's metadata values
'''
"""
return u', '.join([u'%s - %s' % (metadata.metadata_type, metadata.value) for metadata in DocumentMetadata.objects.filter(document=document).select_related('metadata_type')])

2
apps/metadata/forms.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django import forms
from django.utils.translation import ugettext_lazy as _

22
apps/metadata/models.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.db import models
from django.utils.translation import ugettext_lazy as _
@@ -12,9 +12,9 @@ available_functions_string = (_(u' Available functions: %s') % u','.join([u'%s()
class MetadataType(models.Model):
'''
"""
Define a type of metadata
'''
"""
name = models.CharField(unique=True, max_length=48, verbose_name=_(u'name'), help_text=_(u'Do not use python reserved words, or spaces.'))
title = models.CharField(max_length=48, verbose_name=_(u'title'), blank=True, null=True)
default = models.CharField(max_length=128, blank=True, null=True,
@@ -35,9 +35,9 @@ class MetadataType(models.Model):
class MetadataSet(models.Model):
'''
"""
Define a group of metadata types
'''
"""
title = models.CharField(max_length=48, verbose_name=_(u'title'))
def __unicode__(self):
@@ -50,10 +50,10 @@ class MetadataSet(models.Model):
class MetadataSetItem(models.Model):
'''
"""
Define the set of metadata that relates to a set or group of
metadata fields
'''
"""
metadata_set = models.ForeignKey(MetadataSet, verbose_name=_(u'metadata set'))
metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'metadata type'))
#required = models.BooleanField(default=True, verbose_name=_(u'required'))
@@ -67,10 +67,10 @@ class MetadataSetItem(models.Model):
class DocumentMetadata(models.Model):
'''
"""
Link a document to a specific instance of a metadata type with it's
current value
'''
"""
document = models.ForeignKey(Document, verbose_name=_(u'document'))
metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'type'))
value = models.CharField(max_length=256, blank=True, verbose_name=_(u'value'), db_index=True)
@@ -84,10 +84,10 @@ class DocumentMetadata(models.Model):
class DocumentTypeDefaults(models.Model):
'''
"""
Default preselected metadata types and metadata set per document
type
'''
"""
document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
default_metadata_sets = models.ManyToManyField(MetadataSet, blank=True, verbose_name=_(u'default metadata sets'))
default_metadata = models.ManyToManyField(MetadataType, blank=True, verbose_name=_(u'default metadata'))

2
apps/metadata/permissions.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _

1
apps/metadata/tests.py
View File

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
>>> 1 + 1 == 2
True
"""}

36
apps/metadata/views.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import
from django.shortcuts import render_to_response
from django.template import RequestContext
@@ -46,10 +46,10 @@ def metadata_edit(request, document_id=None, document_id_list=None):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_EDIT])
except PermissionDenied:
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_EDIT, request.user, documents)
if not documents:
messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
post_action_redirect = reverse('document_list_recent')
@@ -141,7 +141,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
if not documents:
messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
@@ -205,12 +205,12 @@ def metadata_remove(request, document_id=None, document_id_list=None):
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
try:
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_REMOVE])
except PermissionDenied:
documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_REMOVE, request.user, documents)
if not documents:
messages.error(request, _(u'Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
@@ -304,7 +304,7 @@ def metadata_view(request, document_id):
'hide_link': True,
'object': document,
}, context_instance=RequestContext(request))
# Setup views
def setup_metadata_type_list(request):
@@ -323,12 +323,12 @@ def setup_metadata_type_list(request):
}
return render_to_response('generic_list.html', context,
context_instance=RequestContext(request))
context_instance=RequestContext(request))
def setup_metadata_type_edit(request, metadatatype_id):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_TYPE_EDIT])
metadata_type = get_object_or_404(MetadataType, pk=metadatatype_id)
if request.method == 'POST':
@@ -351,12 +351,12 @@ def setup_metadata_type_edit(request, metadatatype_id):
'object': metadata_type,
'object_name': _(u'metadata type'),
},
context_instance=RequestContext(request))
context_instance=RequestContext(request))
def setup_metadata_type_create(request):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_TYPE_CREATE])
if request.method == 'POST':
form = MetadataTypeForm(request.POST)
if form.is_valid():
@@ -375,7 +375,7 @@ def setup_metadata_type_create(request):
def setup_metadata_type_delete(request, metadatatype_id):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_TYPE_DELETE])
metadata_type = get_object_or_404(MetadataType, pk=metadatatype_id)
post_action_redirect = reverse('setup_metadata_type_list')
@@ -423,7 +423,7 @@ def setup_metadata_set_list(request):
}
return render_to_response('generic_list.html', context,
context_instance=RequestContext(request))
context_instance=RequestContext(request))
def get_set_members(metadata_set):
@@ -471,7 +471,7 @@ def setup_metadata_set_edit(request, metadata_set_id):
def setup_metadata_set_create(request):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_SET_CREATE])
if request.method == 'POST':
form = MetadataSetForm(request.POST)
if form.is_valid():
@@ -490,7 +490,7 @@ def setup_metadata_set_create(request):
def setup_metadata_set_delete(request, metadata_set_id):
Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_SET_DELETE])
metadata_set = get_object_or_404(MetadataSet, pk=metadata_set_id)
post_action_redirect = reverse('setup_metadata_set_list')
@@ -566,7 +566,7 @@ def setup_document_type_metadata(request, document_type_id):
# Initialize defaults
DocumentTypeDefaults.objects.get_or_create(document_type=document_type)
return assign_remove(
request,
left_list=lambda: generate_choices_w_labels(get_document_type_metadata_non_members(document_type)),