Commit e4f23215 authored by Amos Latteier's avatar Amos Latteier

Changed how ProductHelp titles are generated. Fixed a small bug in Product initialization.

parent 8d17ff99
...@@ -226,7 +226,7 @@ class Product(Folder, PermissionManager): ...@@ -226,7 +226,7 @@ class Product(Folder, PermissionManager):
def __init__(self, id, title): def __init__(self, id, title):
self.id=id self.id=id
self.title=title self.title=title
self._setObject('Help', ProductHelp('Help', '%s Help' % id)) self._setObject('Help', ProductHelp('Help', id))
def Destination(self): def Destination(self):
"Return the destination for factory output" "Return the destination for factory output"
...@@ -341,7 +341,7 @@ class Product(Folder, PermissionManager): ...@@ -341,7 +341,7 @@ class Product(Folder, PermissionManager):
with the Product. with the Product.
""" """
if not hasattr(self, 'Help'): if not hasattr(self, 'Help'):
self._setObject('Help', ProductHelp('Help', '%s Help' % self.id)) self._setObject('Help', ProductHelp('Help', self.id))
return self.Help return self.Help
class CompressedOutputFile: class CompressedOutputFile:
...@@ -445,7 +445,7 @@ def initializeProduct(productp, name, home, app): ...@@ -445,7 +445,7 @@ def initializeProduct(productp, name, home, app):
if old is not None: if old is not None:
app._manage_remove_product_meta_type(product) app._manage_remove_product_meta_type(product)
products._delObject(name) products._delObject(name)
for id, v in old.objectValues(): for id, v in old.objectItems():
try: product._setObject(id, v) try: product._setObject(id, v)
except: pass except: pass
......
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