Commit 28e8b97f authored by Chris McDonough's avatar Chris McDonough

Changed product init code so that README.txt can be any of "README.txt",...

Changed product init code so that README.txt can be any of "README.txt", "README.TXT" or "readme.txt".
parent 16d06174
...@@ -319,10 +319,12 @@ class Product(Folder, PermissionManager): ...@@ -319,10 +319,12 @@ class Product(Folder, PermissionManager):
manage_traceback=Globals.DTMLFile('dtml/traceback',globals()) manage_traceback=Globals.DTMLFile('dtml/traceback',globals())
manage_readme=Globals.DTMLFile('dtml/readme',globals()) manage_readme=Globals.DTMLFile('dtml/readme',globals())
def manage_get_product_readme__(self): def manage_get_product_readme__(self):
try: for name in ('README.txt', 'README.TXT', 'readme.txt'):
return open(os.path.join(self.home, 'README.txt')).read() path = os.path.join(self.home, name)
except: return '' if os.path.isfile(path):
return open(path).read()
return ''
def permissionMappingPossibleValues(self): def permissionMappingPossibleValues(self):
return self.possible_permissions() return self.possible_permissions()
...@@ -465,11 +467,14 @@ def initializeProduct(productp, name, home, app): ...@@ -465,11 +467,14 @@ def initializeProduct(productp, name, home, app):
{'label':'Traceback', 'action':'manage_traceback'}, {'label':'Traceback', 'action':'manage_traceback'},
) )
if os.path.exists(os.path.join(home, 'README.txt')): for name in ('README.txt', 'README.TXT', 'readme.txt'):
product.manage_options=product.manage_options+( path = os.path.join(home, name)
{'label':'README', 'action':'manage_readme'}, if os.path.isfile(path):
) product.manage_options=product.manage_options+(
{'label':'README', 'action':'manage_readme'},
)
break
if (os.environ.get('ZEO_CLIENT') and if (os.environ.get('ZEO_CLIENT') and
not os.environ.get('FORCE_PRODUCT_LOAD')): not os.environ.get('FORCE_PRODUCT_LOAD')):
get_transaction().abort() get_transaction().abort()
......
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