ERP5Catalog: fix ZMI view of catalog switching to ERP5 view

product/ERP5/Document/SQLMethod.py

@@ -79,9 +79,10 @@ class SQLMethod(XMLObject, ZSQL, ExpressionMixin):
   manage = manage_main = ZSQL.manage
   manage_main._setName('manage_main')
 
-  # View content list, Force /view, Standard option in SQLMethod
-  manage_options = ({'icon':'', 'label':'View','action':'view'},) \
-                    + ZSQL.manage_options
+  # View content list, replace /view, Standard option in SQLMethod
+  manage_options = ( ZSQL.manage_options[0], ) + \
+     ({'icon':'', 'label':'View','action':'view'},) + \
+     ZSQL.manage_options[2:]
 
   # Declarative properties
   property_sheets = ( PropertySheet.Base

product/ERP5Catalog/Document/ERP5Catalog.py

@@ -151,8 +151,8 @@ class ERP5Catalog(Folder, Catalog):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   # Explicitly add tabs for manage_options
-  manage_options = ({'label': 'View', 'action': 'view'},
-                    {'label': 'Contents', 'action': 'manage_main'},
+  manage_options = ({'label': 'Contents', 'action': 'manage_main'},
+                    {'label': 'View', 'action': 'view'},
                     {'label': 'Security', 'action': 'manage_access'},
                     {'label': 'Undo', 'action': 'manage_UndoForm'},
                     {'label': 'Ownership', 'action': 'manage_owner'},

product/ERP5Catalog/Tool/ERP5CatalogTool.py

@@ -57,8 +57,8 @@ class ERP5CatalogTool(BaseTool, CMFCore_CatalogTool):
     security = ClassSecurityInfo()
 
     # Explicitly add tabs for manage_options
-    manage_options = ({'label': 'View', 'action': 'view'},
-                      {'label': 'Contents', 'action': 'manage_main'},
+    manage_options = ({'label': 'Contents', 'action': 'manage_main'},
+                      {'label': 'View', 'action': 'view'},
                       {'label': 'Security', 'action': 'manage_access'},
                       {'label': 'Undo', 'action': 'manage_UndoForm'},
                       {'label': 'Ownership', 'action': 'manage_owner'},