Cleanup manage_options.

src/OFS/DTMLDocument.py

@@ -38,11 +38,7 @@ class DTMLDocument(PropertyManager, DTMLMethod):
     """
     meta_type = 'DTML Document'
 
-    manage_options = (
-        DTMLMethod.manage_options[:2] +
-        PropertyManager.manage_options +
-        DTMLMethod.manage_options[2:]
-    )
+    manage_options = DTMLMethod.manage_options
 
     # Replace change_dtml_methods by change_dtml_documents
     __ac_permissions__ = tuple([

src/OFS/DTMLMethod.py

@@ -71,7 +71,6 @@ class DTMLMethod(RestrictedDTML,
 
     manage_options = ((
         {'label': 'Edit', 'action': 'manage_main'},
-        {'label': 'View', 'action': ''},
         {'label': 'Proxy', 'action': 'manage_proxyForm'},
     ) +
         RoleManager.manage_options +

src/OFS/Folder.py

@@ -72,8 +72,6 @@ class Folder(
 
     manage_options = (
         ObjectManager.manage_options +
-        ({'label': 'View', 'action': ''}, ) +
-        PropertyManager.manage_options +
         RoleManager.manage_options +
         Item.manage_options
     )

src/OFS/Image.py

@@ -119,11 +119,7 @@ class File(Persistent, Implicit, PropertyManager,
     manage_uploadForm = manage_editForm
 
     manage_options = (
-        (
-            {'label': 'Edit', 'action': 'manage_main'},
-            {'label': 'View', 'action': ''},
-        ) +
-        PropertyManager.manage_options +
+        ({'label': 'Edit', 'action': 'manage_main'}, ) +
         RoleManager.manage_options +
         Item_w__name__.manage_options +
         Cacheable.manage_options
@@ -811,9 +807,7 @@ class Image(File):
     )
 
     manage_options = (
-        ({'label': 'Edit', 'action': 'manage_main'},
-         {'label': 'View', 'action': 'view_image_or_file'}) +
-        PropertyManager.manage_options +
+        ({'label': 'Edit', 'action': 'manage_main'}, ) +
         RoleManager.manage_options +
         Item_w__name__.manage_options +
         Cacheable.manage_options

src/Products/PageTemplates/ZopePageTemplate.py

@@ -89,9 +89,7 @@ class ZopePageTemplate(Script, PageTemplate, Cacheable,
     manage_options = (
         {'label': 'Edit', 'action': 'pt_editForm'},
         {'label': 'Test', 'action': 'ZScriptHTML_tryForm'},
-    ) + PropertyManager.manage_options \
-        + SimpleItem.manage_options \
-        + Cacheable.manage_options
+    ) + SimpleItem.manage_options + Cacheable.manage_options
 
     _properties = (
         {'id': 'title', 'type': 'ustring', 'mode': 'w'},