Revert both revert, as the original commits were just raising another bug but...

Revert both revert, as the original commits were just raising another bug but was not the cause of this bug

This reverts commit e89d10aa.
This reverts commit ff1ca703.

bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeOwnerTitleSearchQuery.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>from Products.ZSQLCatalog.SQLCatalog import SimpleQuery\n
+\n
+portal = context.getPortalObject()\n
+\n
+reference_list = [x.reference for x in\n
+                  portal.portal_catalog(SimpleQuery(reference=None,\n
+                                                    comparison_operator="is not"),\n
+                                        select_list=[\'reference\'],\n
+                                        portal_type="Person", title=value)]\n
+\n
+return SimpleQuery(owner=reference_list or -1)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>value</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>SQLCatalog_makeOwnerTitleSearchQuery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_owner_title.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-query_table</string> </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_owner_title</string> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var query_table>.owner = <dtml-var table_0>.reference\n
-AND <dtml-var table_0>.portal_type = \'Person\'
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml

@@ -3,7 +3,6 @@
  <key>child_telephone_SearchableText | catalog,full_text/SearchableText/z_related_child_telephone</key>
  <key>default_email_text | catalog,email/url_string/z_related_default_email</key>
  <key>destination_person_title | category,catalog/title/z_related_destination_person</key>
- <key>owner_title | catalog/title/z_related_owner_title</key>
  <key>related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use</key>
  <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key>
  <key>source_person_title | category,catalog/title/z_related_source_person</key>

bt5/erp5_base/CatalogScriptableKeyTemplateItem/scriptable_key_list.xml

+<key_list>
+ <key>owner_title | SQLCatalog_makeOwnerTitleSearchQuery</key>
+</key_list>
\ No newline at end of file

bt5/erp5_base/bt/revision

-1026
+1030
\ No newline at end of file

bt5/erp5_base/bt/template_catalog_method_id_list

+erp5_mysql_innodb/SQLCatalog_makeOwnerTitleSearchQuery
 erp5_mysql_innodb/z_related_child_address
 erp5_mysql_innodb/z_related_child_telephone
 erp5_mysql_innodb/z_related_default_email
 erp5_mysql_innodb/z_related_destination_person
-erp5_mysql_innodb/z_related_owner_title
 erp5_mysql_innodb/z_related_resource_use
 erp5_mysql_innodb/z_related_source_organisation
 erp5_mysql_innodb/z_related_source_person
\ No newline at end of file

bt5/erp5_base/bt/template_catalog_related_key_list

@@ -3,6 +3,5 @@ source_person_title | category,catalog/title/z_related_source_person
 destination_person_title | category,catalog/title/z_related_destination_person
 default_email_text | catalog,email/url_string/z_related_default_email
 related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use
-owner_title | catalog/title/z_related_owner_title
 child_address_SearchableText | catalog,full_text/SearchableText/z_related_child_address
 child_telephone_SearchableText | catalog,full_text/SearchableText/z_related_child_telephone
\ No newline at end of file

bt5/erp5_base/bt/template_catalog_scriptable_key_list

+owner_title | SQLCatalog_makeOwnerTitleSearchQuery
\ No newline at end of file