Do not use immediateReindexObject in getParentUid

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34417 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/tests/testERP5Catalog.py

@@ -4038,6 +4038,42 @@ VALUES
         ' AS catalog' % (module_uid, ),
     })[0][0], module_len)
 
+  def test_getParentUid(self, quiet=quiet):
+    from Products.ERP5Type.Document.Person import Person
+    from Products.ERP5Type.Document.Assignment import Assignment
+    person_module = self.getPersonModule()
+
+    person = Person(person_module.generateNewId())
+    person.setDefaultReindexParameters(activate_kw={'after_tag': self.id()})
+    person = person_module[person_module._setObject(person.id, person)]
+    self.assertFalse('uid' in person.__dict__)
+    person.uid = None
+    assignment = Assignment(person.generateNewId())
+    assignment.setDefaultReindexParameters(activate_kw={'tag': self.id()})
+    assignment = person[person._setObject(assignment.id, assignment)]
+    self.assertFalse('uid' in assignment.__dict__)
+    assignment.uid = None
+    get_transaction().commit()
+
+    person_uid_list = []
+    catalog_result_list = []
+    Assignment_getParentUid = Assignment.getParentUid
+    def getParentUid(self):
+      person_uid_list.append(person.uid)
+      uid = Assignment_getParentUid(self)
+      catalog_result_list.append(len(self.portal_catalog(uid=uid)))
+      return uid
+    Assignment.getParentUid = getParentUid
+    try:
+      self.tic()
+    finally:
+      Assignment.getParentUid = Assignment_getParentUid
+    self.assertEqual(catalog_result_list[0], 0)
+    self.assertEqual(person_uid_list[0], None)
+    self.assertTrue(int(person.uid))
+    self.assertEqual(person.uid, assignment.getParentUid())
+
+
 def test_suite():
   suite = unittest.TestSuite()
   suite.addTest(unittest.makeSuite(TestERP5Catalog))

product/ERP5Type/Base.py

@@ -1812,15 +1812,7 @@ class Base( CopyContainer,
       for the implementation of the ZSQLCatalog based listing
       of objects.
     """
-    parent = self.aq_inner.aq_parent
-    uid = getattr(aq_base(parent), 'uid', None)
-    if uid is None:
-      parent.immediateReindexObject() # Required with deferred indexing
-      uid = getattr(aq_base(parent), 'uid', None)
-      if uid is None:
-        LOG('Failed twice getParentUid', 0, str((self.getPhysicalPath(),parent.getPhysicalPath())))
-        raise DeferredCatalogError('Could neither access parent uid nor generate it', self)
-    return uid
+    return self.aq_inner.aq_parent.getUid()
 
   security.declareProtected( Permissions.AccessContentsInformation,
                              'getParentTitleOrId' )