From 2e1291ac4601e5cb99b9b9020f8db77336766f3c Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Tue, 13 Feb 2007 16:22:03 +0000 Subject: [PATCH] Do not open tabs in another browser window (bug #393). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12674 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ZSQLCatalog/SQLCatalog.py | 2 +- product/ZSQLCatalog/ZSQLCatalog.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/product/ZSQLCatalog/SQLCatalog.py b/product/ZSQLCatalog/SQLCatalog.py index bdec9de46f..4c5e19a955 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 8afd516ca4..d40b1dfc85 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')}, -- 2.30.9