Move metadata column registration for Document model to the metadata app

This commit is contained in:
Roberto Rosario
2012-07-26 04:54:33 -04:00
parent fb54b4f1dc
commit 96177c8531
2 changed files with 9 additions and 5 deletions

View File

@@ -10,7 +10,6 @@ from navigation.api import (register_links, register_top_menu,
register_sidebar_template)
from main.api import register_diagnostic, register_maintenance_links
from history.permissions import PERMISSION_HISTORY_VIEW
from metadata.api import get_metadata_string
from project_setup.api import register_setup
from acls.api import class_permissions
@@ -161,9 +160,6 @@ register_model_list_columns(Document, [
{'name':_(u'thumbnail'), 'attribute':
encapsulate(lambda x: document_thumbnail(x))
},
{'name':_(u'metadata'), 'attribute':
encapsulate(lambda x: get_metadata_string(x))
},
])
register_top_menu(

View File

@@ -3,12 +3,14 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from navigation.api import (register_links, register_multi_item_links,
register_sidebar_template)
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
from .api import get_metadata_string
from .models import MetadataType, MetadataSet
from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
@@ -65,3 +67,9 @@ class_permissions(Document, [
PERMISSION_METADATA_DOCUMENT_REMOVE,
PERMISSION_METADATA_DOCUMENT_VIEW,
])
register_model_list_columns(Document, [
{'name':_(u'metadata'), 'attribute':
encapsulate(lambda x: get_metadata_string(x))
},
])