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

Import and PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2012-07-26 22:42:36 -04:00
parent 24bf20b9d7
commit eecf7c7751
69 changed files with 173 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/metadata/__init__.py
View File

@@ -2,11 +2,10 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from navigation.api import (bind_links, register_multi_item_links,
register_sidebar_template, Link, register_model_list_columns)
from navigation.api import (bind_links, register_sidebar_template,
register_model_list_columns)
from common.utils import encapsulate
from documents.models import Document, DocumentType
from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
from project_setup.api import register_setup
from acls.api import class_permissions
@@ -15,8 +14,7 @@ from .models import MetadataType, MetadataSet
from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
PERMISSION_METADATA_DOCUMENT_VIEW)
from .links import (metadata_edit, metadata_view, metadata_multiple_edit,
metadata_add, metadata_multiple_add, metadata_remove, metadata_multiple_remove,
from .links import (metadata_edit, metadata_view, metadata_add, metadata_remove,
setup_metadata_type_list, setup_metadata_type_edit, setup_metadata_type_delete,
setup_metadata_type_create, setup_metadata_set_list, setup_metadata_set_edit,
setup_metadata_set_delete, setup_metadata_set_create, setup_metadata_set_members,

3
apps/metadata/views.py
View File

@@ -150,7 +150,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
else:
messages.warning(request, _(u'Metadata type: %(metadata_type)s already present in document %(document)s.') % {
'metadata_type': metadata_type, 'document': document})
document.mark_indexable()
if len(documents) == 1:
@@ -513,7 +513,6 @@ def setup_metadata_set_delete(request, metadata_set_id):
'metadata_set': metadata_set, 'error': e})
return HttpResponseRedirect(previous)
context = {
'object_name': _(u'metadata set'),
'delete_view': True,