From 4f47e5bc898143f080b83d3453450d4b408d7945 Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Mon, 18 May 2009 10:44:14 +0000
Subject: [PATCH] 2009-05-18 yusei * Fix a proxy field. count_method should not
 be inherited from template field.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27019 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../listbox.xml                                   | 15 ++++++++++-----
 .../listbox.xml                                   | 15 ++++++++++-----
 bt5/erp5_ingestion/bt/change_log                  |  3 +++
 bt5/erp5_ingestion/bt/revision                    |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewLatestContentList/listbox.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewLatestContentList/listbox.xml
index d7f676d28f..78d50c23c6 100644
--- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewLatestContentList/listbox.xml
+++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewLatestContentList/listbox.xml
@@ -13,14 +13,15 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>all_columns</string>
-                <string>editable_columns</string>
                 <string>title</string>
-                <string>select</string>
-                <string>selection_name</string>
                 <string>columns</string>
-                <string>default_params</string>
+                <string>all_columns</string>
                 <string>list_method</string>
+                <string>count_method</string>
+                <string>selection_name</string>
+                <string>default_params</string>
+                <string>select</string>
+                <string>editable_columns</string>
               </list>
             </value>
         </item>
@@ -191,6 +192,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>count_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>default_params</string> </key>
                     <value>
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewMyContentList/listbox.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewMyContentList/listbox.xml
index 7a5a5793d8..864f794a7c 100644
--- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewMyContentList/listbox.xml
+++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/ContributionTool_viewMyContentList/listbox.xml
@@ -13,15 +13,16 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>all_columns</string>
-                <string>editable_columns</string>
                 <string>title</string>
-                <string>select</string>
-                <string>selection_name</string>
-                <string>sort_columns</string>
                 <string>columns</string>
+                <string>all_columns</string>
+                <string>sort_columns</string>
                 <string>sort</string>
                 <string>list_method</string>
+                <string>count_method</string>
+                <string>selection_name</string>
+                <string>select</string>
+                <string>editable_columns</string>
               </list>
             </value>
         </item>
@@ -176,6 +177,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>count_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value>
diff --git a/bt5/erp5_ingestion/bt/change_log b/bt5/erp5_ingestion/bt/change_log
index e32171b3e5..6062cc8604 100644
--- a/bt5/erp5_ingestion/bt/change_log
+++ b/bt5/erp5_ingestion/bt/change_log
@@ -1,3 +1,6 @@
+2009-05-18 yusei
+* Fix a proxy field. count_method should not be inherited from template field.
+
 2009-05-08 Yusei
 * Add field library and proxy fields.
 * Update dependencies.
diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision
index 801f180102..31ff414b74 100644
--- a/bt5/erp5_ingestion/bt/revision
+++ b/bt5/erp5_ingestion/bt/revision
@@ -1 +1 @@
-47
\ No newline at end of file
+48
\ No newline at end of file
-- 
2.30.9