From 5976b84d63cacc55f3732a818b057e069e638c09 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sun, 4 Mar 2007 14:09:06 +0000
Subject: [PATCH] renamed getObject to getResultValue cause of conflict

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13214 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5Catalog/CatalogTool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/product/ERP5Catalog/CatalogTool.py b/product/ERP5Catalog/CatalogTool.py
index f09cec1b20..7f66b5f21c 100644
--- a/product/ERP5Catalog/CatalogTool.py
+++ b/product/ERP5Catalog/CatalogTool.py
@@ -524,8 +524,8 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
 
     # We use a string for permissions here due to circular reference in import
     # from ERP5Type.Permissions
-    security.declareProtected('Search ZCatalog', 'getObject')
-    def getObject(self, query=None, **kw):
+    security.declareProtected('Search ZCatalog', 'getResultValue')
+    def getResultValue(self, query=None, **kw):
         """
         A method to factor common code used to search a single
         object in the database.
-- 
2.30.9