Changed manage_options structures to correct helpt topic references.

lib/python/OFS/History.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Object Histories"""
 
-__version__='$Revision: 1.2 $'[11:-2]
+__version__='$Revision: 1.3 $'[11:-2]
 
 import Globals, ndiff, ExtensionClass
 from DateTime import DateTime
@@ -163,7 +163,7 @@ class Historical(ExtensionClass.Base):
         )
     
     manage_options=({'label':'History', 'action':'manage_change_history_page',
-                     #'help':('OFSP','DTML-Method_Security.dtml')
+                     'help':('OFSP','History.stx')
                      },
                    )
 
@@ -220,7 +220,7 @@ class Historical(ExtensionClass.Base):
 
     
     _manage_historyComparePage=Globals.HTMLFile(
-        'historyCompare', globals())
+        'historyCompare', globals(), management_view='History')
     def manage_historyCompare(self, rev1, rev2, REQUEST,
                               historyComparisonResults=''):
         dt1=DateTime(rev1._p_mtime)

lib/python/OFS/Image.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Image object"""
 
-__version__='$Revision: 1.108 $'[11:-2]
+__version__='$Revision: 1.109 $'[11:-2]
 
 import Globals, string, struct, content_types
 from OFS.content_types import guess_content_type
@@ -450,16 +450,19 @@ class Image(File):
                  {'id':'width', 'type':'string'},
                  )
 
-    # Grrrrr, need to replace the view option.
-    manage_options=tuple(map(
-        lambda o:
-        (o['label']=='View'
-         and
-         {'label':'View', 'action':'view_image_or_file',
-          'help':('OFSP','Image_View.stx')}
-         or o)
-        , File.manage_options))
-        
+    manage_options=(
+        (
+        {'label':'Edit', 'action':'manage_main',
+         'help':('OFSP','Image_Edit.stx')},
+        {'label':'Upload', 'action':'manage_uploadForm',
+         'help':('OFSP','File_Upload.stx')},
+        {'label':'View', 'action':'view_image_or_file',
+         'help':('OFSP','Image_View.stx')}
+        )
+        +PropertyManager.manage_options
+        +Item_w__name__.manage_options
+        +RoleManager.manage_options
+        )
 
     manage_editForm  =HTMLFile('imageEdit',globals(),Kind='Image',kind='image')
     view_image_or_file =HTMLFile('imageView',globals())

lib/python/ZClasses/ZClass.py

@@ -602,7 +602,7 @@ class ZObject:
          'action' :'propertysheets/permissions/manage',
          'help':('OFSP','ZClass_Permissions.stx')},     
         {'label': 'Define Permissions', 'action' :'manage_access',  
-         'help':('OFSP','Security-DefinePermissions.stx')},        
+         'help':('OFSP','Security_Define-Permissions.stx')},        
         )