From 04c5f72e6a99da55d2fb48bc4e07d3a01ab03c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 17 Mar 2011 14:30:00 +0000
Subject: [PATCH] proxify correctly contact listbox of person & organisation

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44392 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_base/Base_viewBaseFieldLibrary.xml   |  3 ++
 .../my_view_mode_contact_listbox.xml}         | 10 +++----
 ...y_view_mode_contact_listbox_int_index.xml} |  2 +-
 .../my_view_mode_contact_listbox_title.xml}   |  2 +-
 .../erp5_base/Entity_viewFieldLibrary.xml     |  3 --
 .../Organisation_viewDetails/listbox.xml      | 29 ++-----------------
 .../listbox_int_index.xml                     |  4 +--
 .../listbox_title.xml                         |  4 +--
 .../erp5_base/Person_view/listbox.xml         |  8 ++---
 .../Person_view/listbox_int_index.xml         |  4 +--
 .../erp5_base/Person_view/listbox_title.xml   |  4 +--
 bt5/erp5_base/bt/revision                     |  2 +-
 12 files changed, 23 insertions(+), 52 deletions(-)
 rename bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/{Entity_viewFieldLibrary/my_contact_listbox.xml => Base_viewBaseFieldLibrary/my_view_mode_contact_listbox.xml} (97%)
 rename bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/{Entity_viewFieldLibrary/listbox_int_index.xml => Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_int_index.xml} (97%)
 rename bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/{Entity_viewFieldLibrary/listbox_title.xml => Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_title.xml} (97%)

diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary.xml
index ea82bcc3d9..bc3f0d09a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary.xml
@@ -89,6 +89,9 @@
                         <string>my_view_mode_person_listbox</string>
                         <string>my_view_mode_site</string>
                         <string>my_view_mode_group</string>
+                        <string>my_view_mode_contact_listbox</string>
+                        <string>my_view_mode_contact_listbox_int_index</string>
+                        <string>my_view_mode_contact_listbox_title</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox.xml
similarity index 97%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox.xml
index ccef63302c..9f72feea9d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox.xml
@@ -10,18 +10,18 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>columns</string>
-                <string>sort</string>
-                <string>portal_types</string>
                 <string>editable_columns</string>
+                <string>portal_types</string>
+                <string>sort</string>
+                <string>title</string>
                 <string>url_columns</string>
               </list>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_contact_listbox</string> </value>
+            <value> <string>my_view_mode_contact_listbox</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -124,7 +124,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>portal_types</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_int_index.xml
similarity index 97%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_int_index.xml
index 7b37cb7e64..f523b8481b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_int_index.xml
@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>listbox_int_index</string> </value>
+            <value> <string>my_view_mode_contact_listbox_int_index</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_title.xml
similarity index 97%
rename from bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_title.xml
index 38ba6f9536..4f3631cc5b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewBaseFieldLibrary/my_view_mode_contact_listbox_title.xml
@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>listbox_title</string> </value>
+            <value> <string>my_view_mode_contact_listbox_title</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
index a8e8687d7f..738e9320df 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
@@ -83,11 +83,8 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_contact_listbox</string>
                         <string>my_product_line_list</string>
                         <string>my_title</string>
-                        <string>listbox_title</string>
-                        <string>listbox_int_index</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
index e00b7e29cc..7689e28326 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
@@ -60,12 +60,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>list_action</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -79,11 +73,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_contact_listbox</string> </value>
+                    <value> <string>my_view_mode_contact_listbox</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
@@ -99,23 +93,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python:\'Folder_viewContentList?\' + modules[\'ZTUtils\'].make_query(portal_type=[x[0] for x in field.get_value(\'portal_types\')])</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml
index 8f6fdc4ca1..7241faea47 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_int_index.xml
@@ -77,11 +77,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>listbox_int_index</string> </value>
+                    <value> <string>my_view_mode_contact_listbox_int_index</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml
index 426744e09a..f6f2ff413a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox_title.xml
@@ -77,11 +77,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>listbox_title</string> </value>
+                    <value> <string>my_view_mode_contact_listbox_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
index 6063d93db1..3c74381204 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
@@ -77,15 +77,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_contact_listbox</string> </value>
+                    <value> <string>my_view_mode_contact_listbox</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>lines</string> </key>
-                    <value> <int>20</int> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml
index 8f6fdc4ca1..7241faea47 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_int_index.xml
@@ -77,11 +77,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>listbox_int_index</string> </value>
+                    <value> <string>my_view_mode_contact_listbox_int_index</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml
index 426744e09a..f6f2ff413a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox_title.xml
@@ -77,11 +77,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>listbox_title</string> </value>
+                    <value> <string>my_view_mode_contact_listbox_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Entity_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 011b5d3457..acecfee9f6 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-961
\ No newline at end of file
+962
\ No newline at end of file
-- 
2.30.9