diff -r 8c757af2fc50 -r 1485db1e2b5e src/pyams_content/component/theme/__init__.py --- a/src/pyams_content/component/theme/__init__.py Wed Jun 24 12:07:40 2020 +0200 +++ b/src/pyams_content/component/theme/__init__.py Fri Jun 26 12:54:13 2020 +0200 @@ -10,21 +10,23 @@ # FOR A PARTICULAR PURPOSE. # -__docformat__ = 'restructuredtext' - from persistent import Persistent from zope.container.contained import Contained from zope.schema.fieldproperty import FieldProperty -from pyams_content.component.theme.interfaces import IThemesManagerTarget, IThemesManager, THEMES_MANAGER_KEY, \ - IThemesTarget, IThemesInfo, THEMES_INFO_KEY, ITagsManager, ITagsManagerTarget, TAGS_MANAGER_KEY, ITagsInfo, \ - ITagsTarget, TAGS_INFO_KEY, ICollectionsManager, ICollectionsManagerTarget, COLLECTIONS_MANAGER_KEY, \ - ICollectionsInfo, ICollectionsTarget, COLLECTIONS_INFO_KEY +from pyams_content.component.theme.interfaces import COLLECTIONS_INFO_KEY, \ + COLLECTIONS_MANAGER_KEY, ICollectionsInfo, ICollectionsManager, ICollectionsManagerTarget, \ + ICollectionsTarget, ITagsInfo, ITagsManager, ITagsManagerTarget, ITagsTarget, IThemesInfo, \ + IThemesManager, IThemesManagerTarget, IThemesTarget, TAGS_INFO_KEY, TAGS_MANAGER_KEY, \ + THEMES_INFO_KEY, THEMES_MANAGER_KEY from pyams_content.features.checker import BaseContentChecker -from pyams_content.features.checker.interfaces import IContentChecker, ERROR_VALUE +from pyams_content.features.checker.interfaces import ERROR_VALUE, IContentChecker from pyams_utils.adapter import adapter_config, get_annotation_adapter from pyams_utils.factory import factory_config + +__docformat__ = 'restructuredtext' + from pyams_content import _ @@ -39,9 +41,6 @@ thesaurus_name = FieldProperty(ITagsManager['thesaurus_name']) extract_name = FieldProperty(ITagsManager['extract_name']) - enable_tags_search = FieldProperty(ITagsManager['enable_tags_search']) - tags_search_target = FieldProperty(ITagsManager['tags_search_target']) - enable_glossary = FieldProperty(ITagsManager['enable_glossary']) glossary_thesaurus_name = FieldProperty(ITagsManager['glossary_thesaurus_name']) @@ -79,8 +78,9 @@ translate = request.localizer.translate tags = ITagsInfo(self.context) if not tags.tags: - output.append(translate(ERROR_VALUE).format(field=translate(ITagsInfo['tags'].title), - message=translate(_("no defined tag")))) + output.append(translate(ERROR_VALUE).format( + field=translate(ITagsInfo['tags'].title), + message=translate(_("no defined tag")))) return output @@ -129,8 +129,9 @@ translate = request.localizer.translate themes = IThemesInfo(self.context) if not themes.themes: - output.append(translate(ERROR_VALUE).format(field=translate(IThemesInfo['themes'].title), - message=translate(_("no defined theme")))) + output.append(translate(ERROR_VALUE).format( + field=translate(IThemesInfo['themes'].title), + message=translate(_("no defined theme")))) return output @@ -179,6 +180,7 @@ translate = request.localizer.translate collections = ICollectionsInfo(self.context) if not collections.collections: - output.append(translate(ERROR_VALUE).format(field=translate(ICollectionsInfo['collections'].title), - message=translate(_("no defined collection")))) + output.append(translate(ERROR_VALUE).format( + field=translate(ICollectionsInfo['collections'].title), + message=translate(_("no defined collection")))) return output