From e6debeff7e95d40c4aa096de1ead64d0b59e8e17 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 13 Dec 2014 04:33:59 -0400 Subject: [PATCH] Move back all search field registration into the documents/__init__ module until the upgrade to Django 1.7.x --- mayan/apps/documents/__init__.py | 1 + mayan/apps/tags/__init__.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index a19d857993..677c944c07 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -152,6 +152,7 @@ document_search.add_model_field('metadata__metadata_type__name', label=_(u'Metad document_search.add_model_field('metadata__value', label=_(u'Metadata value')) document_search.add_model_field('versions__pages__content', label=_(u'Content')) document_search.add_model_field('description', label=_(u'Description')) +document_search.add_model_field('tags__label', label=_(u'Tags')) namespace = StatisticNamespace(name='documents', label=_(u'Documents')) namespace.add_statistic(DocumentStatistics(name='document_stats', label=_(u'Document tendencies'))) diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index 181ab233d7..db8e05a97d 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from acls.api import class_permissions from common.utils import encapsulate -from documents import document_search from documents.models import Document from navigation.api import (register_links, register_model_list_columns, register_top_menu) @@ -59,5 +58,3 @@ register_links(Document, [tag_document_list], menu_name='form_header') register_links(['tags:document_tags', 'tags:tag_remove', 'tags:tag_multiple_remove', 'tags:tag_attach'], [tag_attach], menu_name='sidebar') register_links(['tags:document_tags'], [link_spacer, single_document_multiple_tag_remove], menu_name='multi_item_links') register_links([Document], [link_spacer, tag_multiple_attach, multiple_documents_selection_tag_remove], menu_name='multi_item_links') - -document_search.add_model_field('tags__label', label=_(u'Tags'))