Commit 509fc55b authored by Nicolas Dumazet's avatar Nicolas Dumazet

fix behavior of portal_classes when writing a new Document

and when re-importing an existing document.

In both cases, the generated class is stored in erp5.document.xxx
and we should explicitely setattr() on erp5.document


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39418 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5785bea9
...@@ -831,13 +831,16 @@ def writeLocalDocument(class_id, text, create=1, instance_home=None): ...@@ -831,13 +831,16 @@ def writeLocalDocument(class_id, text, create=1, instance_home=None):
f.write(text) f.write(text)
finally: finally:
f.close() f.close()
# load the file, so that an error is raised if file is invalid
module = imp.load_source(class_id, path) module_path = "erp5.document"
getattr(module, class_id) classpath = "%s.%s" % (module_path, class_id)
module = imp.load_source(classpath, path)
import erp5.document
setattr(erp5.document, class_id, getattr(module, class_id))
# and register correctly the new document # and register correctly the new document
from Products.ERP5Type import document_class_registry from Products.ERP5Type import document_class_registry
document_class_registry[class_id] = "%s.%s" % (module.__name__, class_id) document_class_registry[class_id] = classpath
def setDefaultClassProperties(property_holder): def setDefaultClassProperties(property_holder):
"""Initialize default properties for ERP5Type Documents. """Initialize default properties for ERP5Type Documents.
...@@ -935,10 +938,9 @@ def importLocalDocument(class_id, document_path = None): ...@@ -935,10 +938,9 @@ def importLocalDocument(class_id, document_path = None):
path = os.path.join(path, "%s.py" % class_id) path = os.path.join(path, "%s.py" % class_id)
module_path = "erp5.document" module_path = "erp5.document"
classpath = "%s.%s" % (module_path, class_id) classpath = "%s.%s" % (module_path, class_id)
try:
module = imp.load_source(classpath, path) module = imp.load_source(classpath, path)
except: import erp5.document
raise AttributeError("document was not registered: %s, %s" % (class_id, document_path)) setattr(erp5.document, class_id, getattr(module, class_id))
document_class_registry[class_id] = classpath document_class_registry[class_id] = classpath
else: else:
module_path = classpath.rsplit('.', 1)[0] module_path = classpath.rsplit('.', 1)[0]
......
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