diff --git a/product/ZSQLCatalog/SQLCatalog.py b/product/ZSQLCatalog/SQLCatalog.py index bdec9de46ff3c16425f23a8aa21ac0b37503de9a..4c5e19a9558900aaba7b1da6321009488f5571d5 100644 --- a/product/ZSQLCatalog/SQLCatalog.py +++ b/product/ZSQLCatalog/SQLCatalog.py @@ -1371,7 +1371,7 @@ class Catalog( Folder, # We will check if there is an filter on this # method, if so we may not call this zsqlMethod # for this object - portal_type = object.getPortalType() + portal_type = object.getPortalType() if type_list and portal_type not in type_list: continue elif expression is not None: diff --git a/product/ZSQLCatalog/ZSQLCatalog.py b/product/ZSQLCatalog/ZSQLCatalog.py index 8afd516ca4140618d0428b3c061c6da39e01b3c1..d40b1dfc85f3e1428c8e90b43be13912a4e6fb47 100644 --- a/product/ZSQLCatalog/ZSQLCatalog.py +++ b/product/ZSQLCatalog/ZSQLCatalog.py @@ -84,7 +84,6 @@ class ZCatalog(Folder, Persistent, Implicit): 'help': ('OFSP','ObjectManager_Contents.stx')}, {'label': 'Catalog', # TAB: Cataloged Objects 'action': 'manage_catalogView', - 'target': 'manage_main', 'help':('ZCatalog','ZCatalog_Cataloged-Objects.stx')}, {'label' : 'Filter', # TAB: Filter 'action' : 'manage_catalogFilter' }, @@ -93,15 +92,13 @@ class ZCatalog(Folder, Persistent, Implicit): 'help': ('OFSP','Properties.stx')}, {'label': 'Find Objects', # TAB: Find Objects 'action': 'manage_catalogFind', - 'target':'manage_main', 'help':('ZCatalog','ZCatalog_Find-Items-to-ZCatalog.stx')}, {'label': 'Advanced', # TAB: Advanced 'action': 'manage_catalogAdvanced', - 'target':'manage_main', 'help':('ZCatalog','ZCatalog_Advanced.stx')}, {'label': 'Hot Reindexing', # TAB: Hot Reindex 'action': 'manage_catalogHotReindexing', - 'target':'manage_main', }, + }, {'label': 'Undo', # TAB: Undo 'action': 'manage_UndoForm', 'help': ('OFSP','Undo.stx')},