pyams/pyams_portal: comparison src/pyams

equal deleted inserted replaced

-:1204c6c35575
+:0560f0ceb80f
 import logging
 logger = logging.getLogger('PyAMS (portal)')
 import venusian
+from inspect import isclass
 # import interfaces
 from pyams_form.interfaces.form import IFormContextPermissionChecker
 from pyams_portal.interfaces import IPortlet, IPortletSettings, IPortletConfiguration, IPortletPreviewer, \
 IPortletRenderer, IPortalPortletsConfiguration, IPortalTemplate, IPortalContext, IPortalPage, \
 IPortalTemplateConfiguration, MANAGE_TEMPLATE_PERMISSION, IPortletRendererSettings
 # import packages
 from persistent import Persistent
 from persistent.mapping import PersistentMapping
 from pyams_utils.adapter import adapter_config, ContextAdapter, get_adapter_weight, get_annotation_adapter
+from pyams_utils.factory import get_object_factory
 from pyams_utils.request import check_request
 from pyams_utils.vocabulary import vocabulary_config
 from pyams_viewlet.viewlet import ViewContentProvider
 from pyramid.exceptions import ConfigurationError
 from pyramid.renderers import render
 from pyramid.threadlocal import get_current_registry
 from zope.container.contained import Contained
 from zope.copy import clone
-from zope.interface import implementer, alsoProvides, noLongerProvides
+from zope.interface import implementer, alsoProvides, noLongerProvides, Interface
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.location import locate
 from zope.schema.fieldproperty import FieldProperty
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 permission = FieldProperty(IPortlet['permission'])
 toolbar_image = None
 toolbar_css_class = 'fa fa-fw fa-2x fa-edit'
-settings_class = None
+settings_factory = None
 class portlet_config(object):
 """Class decorator used to declare a portlet"""
 class PortletSettings(Persistent, Contained):
 """Portlet settings persistent class
 This class is supposed to be sub-classed by all custom portlet subclasses to
 store their configuration settings.
-Each portlet sub-class must define it's settings class in it's "settings_class" attribute.
+Each portlet sub-class must define it's settings factory in it's "settings_factory" attribute.
+Given factory can be a function, a class or an interface; in this last case, implementation
+is looking for default object factory registered for this interface.
 """
 _renderer = FieldProperty(IPortletSettings['renderer'])
 __name__ = '++settings++'
 _inherit_parent = FieldProperty(IPortletConfiguration['inherit_parent'])
 _settings = FieldProperty(IPortletConfiguration['settings'])
 def __init__(self, portlet):
 self.portlet_name = portlet.name
-self._settings = portlet.settings_class(self)
+factory = portlet.settings_factory
+if isclass(factory) and issubclass(factory, Interface):
+factory = get_object_factory(factory)
+assert factory is not None, "Missing portlet settings factory"
+self._settings = factory(self)
 @property
 def can_inherit(self):
 return not IPortalTemplate.providedBy(self.__parent__)

changeset 110	0560f0ceb80f
parent 107	563e611a329f
child 112	cba761272ab8