From 96177c8531b64497ea7b0ff4a188ef29462d52d1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 26 Jul 2012 04:54:33 -0400 Subject: [PATCH] Move metadata column registration for Document model to the metadata app --- apps/documents/__init__.py | 4 ---- apps/metadata/__init__.py | 10 +++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index 04f6faece8..4a48cfedb4 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -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( diff --git a/apps/metadata/__init__.py b/apps/metadata/__init__.py index 29ee9ac45e..76e2fbb07f 100644 --- a/apps/metadata/__init__.py +++ b/apps/metadata/__init__.py @@ -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)) + }, + ])