From 8f1d74c4fb945e120e7ec9198f61032b30d2dac5 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 20 Oct 2009 12:32:17 +0000
Subject: [PATCH] * remove duplicate entries from 'All Columns' that already
exist in 'Columns'. * installation state and building state are not sortable.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29851 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_core/BaseType_viewAction/listbox.xml | 19 +----
.../erp5_core/BaseType_viewRole/listbox.xml | 12 ----
.../Base_jumpToRelatedObjectList/listbox.xml | 19 +----
.../Base_viewDocumentList/listbox.xml | 20 ------
.../listbox.xml | 12 ----
.../listbox.xml | 71 ++++++-------------
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
7 files changed, 26 insertions(+), 129 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
index d872b1b376..ad7284edc3 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewAction/listbox.xml
@@ -115,24 +115,7 @@
<item>
<key> <string>all_columns</string> </key>
<value>
- <list>
- <tuple>
- <string>reference</string>
- <string>Reference</string>
- </tuple>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>action_type_title</string>
- <string>Category</string>
- </tuple>
- <tuple>
- <string>float_index</string>
- <string>Priority</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/listbox.xml
index f190de549a..a683fbdc97 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_viewRole/listbox.xml
@@ -83,22 +83,10 @@
<key> <string>all_columns</string> </key>
<value>
<list>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>role_name</string>
- <string>Roles</string>
- </tuple>
<tuple>
<string>role_category_list</string>
<string>Categories</string>
</tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
</list>
</value>
</item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList/listbox.xml
index d9d294f293..f34c0da929 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_jumpToRelatedObjectList/listbox.xml
@@ -313,24 +313,7 @@
<item>
<key> <string>all_columns</string> </key>
<value>
- <list>
- <tuple>
- <string>id</string>
- <string>ID</string>
- </tuple>
- <tuple>
- <string>translated_portal_type</string>
- <string>Portal Type</string>
- </tuple>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml
index 4e8b5b0f21..3d18a8f6e1 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml
@@ -115,18 +115,6 @@
<key> <string>all_columns</string> </key>
<value>
<list>
- <tuple>
- <string>download</string>
- <string>Download</string>
- </tuple>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>translated_portal_type</string>
- <string>Type</string>
- </tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
@@ -147,18 +135,10 @@
<string>short_title</string>
<string>Short Title</string>
</tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
<tuple>
<string>int_index</string>
<string>Index</string>
</tuple>
- <tuple>
- <string>translated_validation_state_title</string>
- <string>State</string>
- </tuple>
<tuple>
<string>source_reference</string>
<string>File Name</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml
index ef7f009646..7f386977b2 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml
@@ -318,22 +318,10 @@
<string>id</string>
<string>ID</string>
</tuple>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
<tuple>
<string>translated_preference_state_title</string>
<string>Active</string>
</tuple>
- <tuple>
- <string>Preference_getPriorityAsText</string>
- <string>Level</string>
- </tuple>
<tuple>
<string>owner</string>
<string>Owner</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList/listbox.xml
index 44a72f65e0..bb6a8f131a 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewBusinessTemplateList/listbox.xml
@@ -313,36 +313,7 @@
<item>
<key> <string>all_columns</string> </key>
<value>
- <list>
- <tuple>
- <string>id</string>
- <string>ID</string>
- </tuple>
- <tuple>
- <string>title</string>
- <string>Name</string>
- </tuple>
- <tuple>
- <string>version</string>
- <string>Version</string>
- </tuple>
- <tuple>
- <string>revision</string>
- <string>Revision</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
- <tuple>
- <string>translated_installation_state_title</string>
- <string>Installation State</string>
- </tuple>
- <tuple>
- <string>translated_building_state_title</string>
- <string>Building State</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -355,6 +326,10 @@
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>columns</string> </key>
<value>
@@ -460,6 +435,10 @@
<key> <string>hidden</string> </key>
<value> <int>0</int> </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>30</int> </value>
@@ -524,6 +503,10 @@
<key> <string>reverse</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>row_css_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>search</string> </key>
<value> <int>1</int> </value>
@@ -590,14 +573,6 @@
<string>description</string>
<string>Description</string>
</tuple>
- <tuple>
- <string>translated_installation_state_title</string>
- <string>Installation State</string>
- </tuple>
- <tuple>
- <string>translated_building_state_title</string>
- <string>Building State</string>
- </tuple>
</list>
</value>
</item>
@@ -615,6 +590,12 @@
<key> <string>title</string> </key>
<value> <string>Business Templates</string> </value>
</item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>url_columns</string> </key>
<value>
@@ -634,11 +615,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -653,11 +631,8 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 3bc9696c43..4e98696eb7 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1343
\ No newline at end of file
+1344
\ No newline at end of file
--
2.30.9