From f98f0303ee01d469a0f622a7619e41be6dca6703 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 19 Oct 2010 15:11:01 +0000
Subject: [PATCH] fix duplicate selection names.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39354 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../ERP5Site_viewDocumentList/listbox.xml     | 15 +++++-----
 .../listbox.xml                               | 12 ++++----
 .../erp5_dms/ExternalSource_view/listbox.xml  | 29 +++++--------------
 bt5/erp5_dms/bt/revision                      |  2 +-
 4 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_viewDocumentList/listbox.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_viewDocumentList/listbox.xml
index 786cf27bf7..ce1928abae 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_viewDocumentList/listbox.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Site_viewDocumentList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19,6 +16,7 @@
                 <string>editable_columns</string>
                 <string>list_method</string>
                 <string>search_columns</string>
+                <string>selection_name</string>
                 <string>sort_columns</string>
               </list>
             </value>
@@ -211,6 +209,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string>document_worklist_selection</string> </value>
+                </item>
                 <item>
                     <key> <string>sort_columns</string> </key>
                     <value>
@@ -262,10 +264,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSourceModule_viewExternalSourceList/listbox.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSourceModule_viewExternalSourceList/listbox.xml
index ac7928936d..8bce6176e1 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSourceModule_viewExternalSourceList/listbox.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSourceModule_viewExternalSourceList/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13,8 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>columns</string>
+                <string>selection_name</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -130,6 +128,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>DocumentModule_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string>extra_source_selection</string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/listbox.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/listbox.xml
index ffa8854048..e36a854f42 100644
--- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/listbox.xml
+++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13,14 +10,14 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
-                <string>selection_name</string>
                 <string>columns</string>
                 <string>count_method</string>
-                <string>list_method</string>
                 <string>domain_tree</string>
                 <string>lines</string>
+                <string>list_method</string>
                 <string>portal_types</string>
+                <string>selection_name</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -145,7 +142,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>folder_selection</string> </value>
+                    <value> <string>externel_source_item_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
@@ -163,13 +160,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -182,13 +173,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 77e48ce775..51b4bee793 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-1193
\ No newline at end of file
+1194
\ No newline at end of file
-- 
2.30.9