Commit 6432cda0 authored by Arnaud Fontaine's avatar Arnaud Fontaine

When loading Component, look for matching reference in portal_components rather than ID.

parent 4a112c8e
...@@ -57,26 +57,31 @@ class ComponentModule(ModuleType): ...@@ -57,26 +57,31 @@ class ComponentModule(ModuleType):
from types import ModuleType from types import ModuleType
from zLOG import LOG, INFO from zLOG import LOG, INFO
def generateComponentClassWrapper(namespace): def generateComponentClassWrapper(namespace, portal_type):
def generateComponentClass(component_name): def generateComponentClass(component_name):
site = getSite() site = getSite()
# XXX-arnau: erp5.component.extension.VERSION.REFERENCE perhaps but there
# should be a a way to specify priorities such as portal_skins maybe?
component_id = '%s.%s' % (namespace, component_name) component_id = '%s.%s' % (namespace, component_name)
try: try:
component = getattr(site.portal_components, component_id) # XXX-arnau: Performances?
except AttributeError: component = site.portal_catalog.unrestrictedSearchResults(
parent_uid=site.portal_components.getUid(),
reference=component_name,
validation_state=('validated', 'modified'),
portal_type=portal_type)[0].getObject()
except IndexError:
LOG("ERP5Type.dynamic", INFO, LOG("ERP5Type.dynamic", INFO,
"Could not find %s, perhaps it has not been migrated yet?" % \ "Could not find %s, perhaps it has not been migrated yet?" % \
component_id) component_id)
raise raise AttributeError("Component %s not found or not validated" % \
component_id)
else: else:
if component.getValidationState() == 'validated':
new_module = ModuleType(component_id, component.getDescription()) new_module = ModuleType(component_id, component.getDescription())
component.load(new_module.__dict__, validated_only=True) component.load(new_module.__dict__, validated_only=True)
LOG("ERP5Type.dynamic", INFO, "Loaded successfully %s" % component_id) LOG("ERP5Type.dynamic", INFO, "Loaded successfully %s" % component_id)
return new_module return new_module
else:
raise AttributeError("Component %s not validated" % component_id)
return generateComponentClass return generateComponentClass
...@@ -129,8 +129,10 @@ def initializeDynamicModules(): ...@@ -129,8 +129,10 @@ def initializeDynamicModules():
erp5.component.extension = registerDynamicModule( erp5.component.extension = registerDynamicModule(
'erp5.component.extension', 'erp5.component.extension',
generateComponentClassWrapper('erp5.component.extension')) generateComponentClassWrapper('erp5.component.extension',
'Extension Component'))
erp5.component.document = registerDynamicModule( erp5.component.document = registerDynamicModule(
'erp5.component.document', 'erp5.component.document',
generateComponentClassWrapper('erp5.component.document')) generateComponentClassWrapper('erp5.component.document',
'Document Component'))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment