- Disentangle permission settings for related classes (merge from 2.6
    / 2.7 audit).

lib/python/OFS/DTMLDocument.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.50 $'[11:-2]
+__version__='$Revision: 1.51 $'[11:-2]
 
 from ZPublisher.Converters import type_converters
 from Globals import HTML, DTMLFile, MessageDialog
@@ -46,15 +46,10 @@ class DTMLDocument(PropertyManager, DTMLMethod):
         DTMLMethod.manage_options[2:]
         )
     
+    ps = DTMLMethod.__ac_permissions__
     __ac_permissions__=(
-        ('Change DTML Documents',
-         ('manage_editForm', 'manage', 'manage_main',
-          'manage_edit', 'manage_upload', 'PUT',
-          'manage_historyCopy',
-          'manage_beforeHistoryCopy', 'manage_afterHistoryCopy',
-          )
-         ),
-        )
+        ps[0], ('Change DTML Documents', ps[1][1]), ps[2], ps[3], ps[4])
+    del ps
 
     def manage_edit(self,data,title,SUBMIT='Change',dtpref_cols='100%',
                     dtpref_rows='20',REQUEST=None):

lib/python/OFS/DTMLMethod.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """DTML Method objects."""
 
-__version__='$Revision: 1.83 $'[11:-2]
+__version__='$Revision: 1.84 $'[11:-2]
 
 import History
 from Globals import HTML, DTMLFile, MessageDialog
@@ -73,6 +73,7 @@ class DTMLMethod(RestrictedDTML, HTML, Acquisition.Implicit, RoleManager,
         +Cacheable.manage_options
         )
 
+    # Careful in changes--used by DTMLDocument!
     __ac_permissions__=(
     ('View management screens',
      ('document_src', 'PrincipiaSearchSource')),