Merged tab order fix

lib/python/AccessControl/User.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Access control package"""
 
-__version__='$Revision: 1.112 $'[11:-2]
+__version__='$Revision: 1.113 $'[11:-2]
 
 import Globals, socket, regex, SpecialUsers
 from Globals import HTMLFile, MessageDialog, Persistent, PersistentMapping
@@ -350,8 +350,8 @@ class BasicUserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
         {'label':'Contents', 'action':'manage_main',
          'help':('OFSP','User-Folder_Contents.stx')},
         )
-        +Item.manage_options
         +RoleManager.manage_options
+        +Item.manage_options
         )
 
     __ac_permissions__=(

lib/python/Products/OFSP/Version.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Version object"""
 
-__version__='$Revision: 1.42 $'[11:-2]
+__version__='$Revision: 1.43 $'[11:-2]
 
 import Globals, time
 from AccessControl.Role import RoleManager
@@ -123,8 +123,8 @@ class Version(Persistent,Implicit,RoleManager,Item):
         {'label':'Properties', 'action':'manage_editForm',
          'help':('OFSP','Version_Properties.stx')},
         )
-        +Item.manage_options
         +RoleManager.manage_options
+        +Item.manage_options
         )
 
     __ac_permissions__=(

lib/python/Shared/DC/ZRDB/DA.py

@@ -85,8 +85,8 @@
 __doc__='''Generic Database adapter
 
 
-$Id: DA.py,v 1.89 2000/06/26 19:30:30 brian Exp $'''
-__version__='$Revision: 1.89 $'[11:-2]
+$Id: DA.py,v 1.90 2000/07/26 15:48:19 brian Exp $'''
+__version__='$Revision: 1.90 $'[11:-2]
 
 import OFS.SimpleItem, Aqueduct, RDB
 import DocumentTemplate, marshal, md5, base64, Acquisition, os
@@ -155,8 +155,8 @@ class DA(
         {'label':'Advanced', 'action':'manage_advancedForm',
          'help':('ZSQLMethods','Z-SQL-Method_Advanced.stx')},
         )
-        +OFS.SimpleItem.Item.manage_options
         +AccessControl.Role.RoleManager.manage_options
+        +OFS.SimpleItem.Item.manage_options
         )
  
     # Specify how individual operations add up to "permissions":