equal
deleted
inserted
replaced
32 from pyams_catalog.nltk import NltkFullTextProcessor |
32 from pyams_catalog.nltk import NltkFullTextProcessor |
33 from pyams_catalog.site import check_required_indexes |
33 from pyams_catalog.site import check_required_indexes |
34 from pyams_content.shared.common.manager import SharedToolContainer |
34 from pyams_content.shared.common.manager import SharedToolContainer |
35 from pyams_content.shared.form.manager import FormsManager |
35 from pyams_content.shared.form.manager import FormsManager |
36 from pyams_content.shared.imagemap.manager import ImageMapsManager |
36 from pyams_content.shared.imagemap.manager import ImageMapsManager |
|
37 from pyams_content.shared.logo.manager import LogosManager |
37 from pyams_content.shared.news.manager import NewsManager |
38 from pyams_content.shared.news.manager import NewsManager |
38 from pyams_content.shared.view.manager import ViewsManager |
39 from pyams_content.shared.view.manager import ViewsManager |
39 from pyams_i18n.index import I18nTextIndexWithInterface |
40 from pyams_i18n.index import I18nTextIndexWithInterface |
40 from pyams_security.index import PrincipalsRoleIndex |
41 from pyams_security.index import PrincipalsRoleIndex |
41 from pyams_utils.registry import utility_config, get_global_registry |
42 from pyams_utils.registry import utility_config, get_global_registry |
52 REQUIRED_UTILITIES = () |
53 REQUIRED_UTILITIES = () |
53 |
54 |
54 |
55 |
55 REQUIRED_TOOLS = [('views', ViewsManager), |
56 REQUIRED_TOOLS = [('views', ViewsManager), |
56 ('news', NewsManager), |
57 ('news', NewsManager), |
|
58 ('logos', LogosManager), |
57 ('forms', FormsManager), |
59 ('forms', FormsManager), |
58 ('imagemaps', ImageMapsManager)] |
60 ('imagemaps', ImageMapsManager)] |
59 |
61 |
60 |
62 |
61 REQUIRED_INDEXES = [('content_type', FieldIndexWithInterface, {'interface': IBaseContent, |
63 REQUIRED_INDEXES = [('content_type', FieldIndexWithInterface, {'interface': IBaseContent, |
124 registry = get_global_registry() |
126 registry = get_global_registry() |
125 for name, default_factory in tools: |
127 for name, default_factory in tools: |
126 factory = registry.settings.get('pyams_content.config.{name}_tool_factory'.format(name=name)) |
128 factory = registry.settings.get('pyams_content.config.{name}_tool_factory'.format(name=name)) |
127 if (factory is None) or (factory.upper() not in ('NONE', '--')): |
129 if (factory is None) or (factory.upper() not in ('NONE', '--')): |
128 attr_name = '{name}_tool_name'.format(name=name) |
130 attr_name = '{name}_tool_name'.format(name=name) |
129 tool_name = getattr(config, attr_name) or \ |
131 tool_name = getattr(config, attr_name, None) or \ |
130 registry.settings.get('pyams_content.config.{name}'.format(name=attr_name), name) |
132 registry.settings.get('pyams_content.config.{name}'.format(name=attr_name), name) |
131 if tool_name not in manager: |
133 if tool_name not in manager: |
132 if factory is not None: |
134 if factory is not None: |
133 factory = DottedNameResolver().resolve(factory) |
135 factory = DottedNameResolver().resolve(factory) |
134 else: |
136 else: |