Skip to content

erp5
erp5
Commit bfc6e410 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Allow to search Person and Organisation by Address. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42972 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0649cc1a
Show whitespace changes
Inline Side-by-side
Showing with 628 additions and 20 deletions
bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_child_address.xml 0 → 100644
View file @ bfc6e410
<?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
table_1</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_child_address</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
<dtml-comment>\n
table_0 : catalog as child\n
table_1 : address as address\n
</dtml-comment>\n
catalog.uid = <dtml-var table_0>.parent_uid\n
AND <dtml-var table_0>.portal_type = \'Address\'\n
AND <dtml-var table_0>.uid = <dtml-var table_1>.uid
]]></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
View file @ bfc6e410
<key_list> <key_list>
<key>child_address_SearchableText | catalog,full_text/SearchableText/z_related_child_address</key>
<key>default_email_text | catalog,email/url_string/z_related_default_email</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>destination_person_title | category,catalog/title/z_related_destination_person</key>
<key>owner_title | catalog/title/z_related_owner_title</key> <key>owner_title | catalog/title/z_related_owner_title</key>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
View file @ bfc6e410
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<value> <value>
<list> <list>
<string>bottom</string> <string>bottom</string>
<string>hidden</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -65,6 +66,14 @@ ...@@ -65,6 +66,14 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_child_address_SearchableText</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
View file @ bfc6e410
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
<string>FAX</string> <string>FAX</string>
</tuple> </tuple>
<tuple> <tuple>
<string>default_address_text</string> <string>child_address_SearchableText</string>
<string>Address</string> <string>Address (Full Text)</string>
</tuple> </tuple>
<tuple> <tuple>
<string>social_form_translated_title</string> <string>social_form_translated_title</string>
...@@ -278,6 +278,10 @@ ...@@ -278,6 +278,10 @@
<string>modification_date</string> <string>modification_date</string>
<string>Modification Date</string> <string>Modification Date</string>
</tuple> </tuple>
<tuple>
<string>child_address_SearchableText</string>
<string>Address (Full Text)</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox_child_address_SearchableText.xml 0 → 100644
View file @ bfc6e410
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="StringField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_child_address_SearchableText</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>listbox_child_address_SearchableText</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>cell/getDefaultAddressText</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
View file @ bfc6e410
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<value> <value>
<list> <list>
<string>bottom</string> <string>bottom</string>
<string>hidden</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -65,6 +66,14 @@ ...@@ -65,6 +66,14 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_child_address_SearchableText</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
View file @ bfc6e410
...@@ -105,10 +105,6 @@ ...@@ -105,10 +105,6 @@
<string>default_fax_text</string> <string>default_fax_text</string>
<string>FAX</string> <string>FAX</string>
</tuple> </tuple>
<tuple>
<string>default_address_text</string>
<string>Address</string>
</tuple>
<tuple> <tuple>
<string>gender_translated_title</string> <string>gender_translated_title</string>
<string>Gender</string> <string>Gender</string>
...@@ -138,8 +134,8 @@ ...@@ -138,8 +134,8 @@
<string>Nationality</string> <string>Nationality</string>
</tuple> </tuple>
<tuple> <tuple>
<string>default_address_text</string> <string>child_address_SearchableText</string>
<string>Address</string> <string>Address (Full Text)</string>
</tuple> </tuple>
<tuple> <tuple>
<string>marital_status_translated_title</string> <string>marital_status_translated_title</string>
...@@ -314,10 +310,6 @@ Role & Region ...@@ -314,10 +310,6 @@ Role & Region
<string>default_fax_text</string> <string>default_fax_text</string>
<string>FAX</string> <string>FAX</string>
</tuple> </tuple>
<tuple>
<string>default_address_text</string>
<string>Address</string>
</tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
...@@ -343,8 +335,8 @@ Role & Region ...@@ -343,8 +335,8 @@ Role & Region
<string>Email</string> <string>Email</string>
</tuple> </tuple>
<tuple> <tuple>
<string>default_address_text</string> <string>child_address_SearchableText</string>
<string>Address</string> <string>Address (Full Text)</string>
</tuple> </tuple>
<tuple> <tuple>
<string>marital_status_translated_title</string> <string>marital_status_translated_title</string>
...@@ -404,10 +396,6 @@ Role & Region ...@@ -404,10 +396,6 @@ Role & Region
<string>default_fax_text</string> <string>default_fax_text</string>
<string>FAX</string> <string>FAX</string>
</tuple> </tuple>
<tuple>
<string>default_address_text</string>
<string>Address</string>
</tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox_child_address_SearchableText.xml 0 → 100644
View file @ bfc6e410
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="StringField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_child_address_SearchableText</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>listbox_child_address_SearchableText</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>cell/getDefaultAddressText</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/bt/revision
View file @ bfc6e410
939 942
\ No newline at end of file \ No newline at end of file
bt5/erp5_base/bt/template_catalog_method_id_list
View file @ bfc6e410
erp5_mysql_innodb/z_related_child_address
erp5_mysql_innodb/z_related_default_email erp5_mysql_innodb/z_related_default_email
erp5_mysql_innodb/z_related_destination_person erp5_mysql_innodb/z_related_destination_person
erp5_mysql_innodb/z_related_owner_title erp5_mysql_innodb/z_related_owner_title
......
bt5/erp5_base/bt/template_catalog_related_key_list
View file @ bfc6e410
...@@ -4,3 +4,4 @@ destination_person_title | category,catalog/title/z_related_destination_person ...@@ -4,3 +4,4 @@ destination_person_title | category,catalog/title/z_related_destination_person
default_email_text | catalog,email/url_string/z_related_default_email 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_use
owner_title | catalog/title/z_related_owner_title owner_title | catalog/title/z_related_owner_title
child_address_SearchableText | catalog,full_text/SearchableText/z_related_child_address
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7