From 72e314b710fb750efc3cf1d10250e8b9d3baf983 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Wed, 25 Apr 2012 15:58:26 +0200
Subject: [PATCH] use standard selection name coming from proxy

---
 .../erp5_base/Person_view/listbox.xml         | 12 +--------
 bt5/erp5_base/bt/revision                     |  2 +-
 .../CredentialRecovery_view/listbox.xml       |  9 -------
 .../CredentialRequest_view/event_listbox.xml  | 27 ++++++++++---------
 .../CredentialRequest_view/listbox.xml        |  9 ++-----
 .../CredentialUpdate_view/listbox.xml         |  9 ++-----
 bt5/erp5_credential/bt/revision               |  2 +-
 .../erp5_crm/Base_viewEventList/listbox.xml   |  5 ----
 .../Base_viewEventList/ticket_listbox.xml     | 11 +++-----
 bt5/erp5_crm/bt/revision                      |  2 +-
 10 files changed, 26 insertions(+), 62 deletions(-)

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 3c74381204..16a74ab256 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
@@ -9,9 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>selection_name</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -60,10 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -83,10 +77,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewBaseFieldLibrary</string> </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>person_contact_list_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 26344f96b0..7e68ad78cb 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-1022
\ No newline at end of file
+1023
\ No newline at end of file
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_view/listbox.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_view/listbox.xml
index afc983a026..9ce2901fdf 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_view/listbox.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_view/listbox.xml
@@ -14,7 +14,6 @@
                 <string>editable_columns</string>
                 <string>enabled</string>
                 <string>portal_types</string>
-                <string>selection_name</string>
                 <string>sort</string>
                 <string>title</string>
                 <string>url_columns</string>
@@ -85,10 +84,6 @@
                     <key> <string>portal_types</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value> <string></string> </value>
@@ -201,10 +196,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>person_contact_list_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/event_listbox.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/event_listbox.xml
index 29fefd74bb..458c51ee74 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/event_listbox.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/event_listbox.xml
@@ -10,17 +10,16 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>editable_columns</string>
-                <string>sort</string>
-                <string>description</string>
-                <string>title</string>
+                <string>columns</string>
                 <string>count_method</string>
-                <string>selection_name</string>
+                <string>description</string>
+                <string>editable_columns</string>
+                <string>hide_rows_on_no_search_criterion</string>
+                <string>lines</string>
                 <string>list_method</string>
                 <string>portal_types</string>
-                <string>columns</string>
-                <string>lines</string>
-                <string>hide_rows_on_no_search_criterion</string>
+                <string>sort</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -165,6 +164,14 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewCredentialFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
                 <item>
                     <key> <string>list_method</string> </key>
                     <value>
@@ -198,10 +205,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>ticket_view_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/listbox.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/listbox.xml
index beac3b76ae..49494ed4d5 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/listbox.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_view/listbox.xml
@@ -10,13 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>columns</string>
                 <string>editable_columns</string>
+                <string>portal_types</string>
                 <string>sort</string>
                 <string>title</string>
                 <string>url_columns</string>
-                <string>selection_name</string>
-                <string>portal_types</string>
-                <string>columns</string>
               </list>
             </value>
         </item>
@@ -162,10 +161,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>person_contact_list_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_view/listbox.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_view/listbox.xml
index beac3b76ae..49494ed4d5 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_view/listbox.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_view/listbox.xml
@@ -10,13 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>columns</string>
                 <string>editable_columns</string>
+                <string>portal_types</string>
                 <string>sort</string>
                 <string>title</string>
                 <string>url_columns</string>
-                <string>selection_name</string>
-                <string>portal_types</string>
-                <string>columns</string>
               </list>
             </value>
         </item>
@@ -162,10 +161,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>person_contact_list_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision
index 5c9fe11c04..511fa83dfa 100644
--- a/bt5/erp5_credential/bt/revision
+++ b/bt5/erp5_credential/bt/revision
@@ -1 +1 @@
-413
\ No newline at end of file
+414
\ No newline at end of file
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/listbox.xml
index d07212bd53..52c9e5c400 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/listbox.xml
@@ -16,7 +16,6 @@
                 <string>list_method</string>
                 <string>portal_types</string>
                 <string>search_columns</string>
-                <string>selection_name</string>
                 <string>sort</string>
                 <string>sort_columns</string>
                 <string>title</string>
@@ -226,10 +225,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>entity_related_event_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/ticket_listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/ticket_listbox.xml
index 1534bca988..0cb5d8e95d 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/ticket_listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/ticket_listbox.xml
@@ -10,13 +10,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>columns</string>
                 <string>editable_columns</string>
-                <string>sort</string>
-                <string>title</string>
-                <string>selection_name</string>
                 <string>list_method</string>
                 <string>portal_types</string>
-                <string>columns</string>
+                <string>sort</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -162,10 +161,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>entity_support_request_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 995fb338a8..7dfce3516b 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-593
\ No newline at end of file
+594
\ No newline at end of file
-- 
2.30.9