Commit 0cefde41 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5_base: Rename z_related_resource_use into z_related_resource_related_use

This ZSQLMethod is shadowing the one ERP5Catalog is trying to use, and
it has a table list incompatible in 2 ways:
- it joins again with catalog, despite only being used to pick the uid,
  which ERP5Catalog stopped doing for auto-generated related keys
- it is actually a chained related key: resource, then use. But
  "resource_use" exists as a Base Category, and is accessible (but broken
  until this change) as "default_resource_use_uid" (for example).
parent fe1a8d04
......@@ -19,7 +19,7 @@ table_3</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>z_related_resource_use</string> </value>
<value> <string>z_related_resource_related_use</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
......@@ -3,7 +3,7 @@
<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>related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use</key>
<key>related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_related_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>
</key_list>
\ No newline at end of file
......@@ -4,7 +4,7 @@ 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_destination_person_full_text
erp5_mysql_innodb/z_related_resource_use
erp5_mysql_innodb/z_related_resource_related_use
erp5_mysql_innodb/z_related_source_organisation
erp5_mysql_innodb/z_related_source_organisation_full_text
erp5_mysql_innodb/z_related_source_person
......
......@@ -2,6 +2,6 @@ source_organisation_title | category,catalog/title/z_related_source_organisation
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
related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_related_use
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment