From 1e8fde68da151e2e579513331313f2c8a905c819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 12 Mar 2009 12:03:54 +0000
Subject: [PATCH] - make form useful again: - proxify - show more properties -
use proper method to fetch divergence message list - use form_view instead of
form_dialog
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26001 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_trade/Delivery_viewDivergence.xml | 20 +-
.../Delivery_viewDivergence/listbox.xml | 443 ++----------------
bt5/erp5_trade/bt/revision | 2 +-
3 files changed, 66 insertions(+), 399 deletions(-)
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
index 53e3ec3117..2801f64eb7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence.xml
@@ -40,6 +40,16 @@
<key> <string>action</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>edit_order</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
@@ -52,7 +62,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
- <string>Default</string>
+ <string>bottom</string>
</list>
</value>
</item>
@@ -61,7 +71,7 @@
<value>
<dictionary>
<item>
- <key> <string>Default</string> </key>
+ <key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
@@ -81,11 +91,11 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>PackingList_viewDivergence</string> </value>
+ <value> <string>Delivery_viewDivergence</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
- <value> <string>form_dialog</string> </value>
+ <value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
@@ -97,7 +107,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value> <string>Divergence Messages</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
index 1e81602d17..51f1abeb09 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
@@ -3,12 +3,23 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>columns</string>
+ <string>list_method</string>
+ <string>selection_name</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox</string> </value>
@@ -29,135 +40,15 @@
<value>
<dictionary>
<item>
- <key> <string>all_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>columns</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>meta_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>page_template</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>select</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>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -168,135 +59,15 @@
<value>
<dictionary>
<item>
- <key> <string>all_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>meta_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>page_template</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>select</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>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>sort_columns</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -306,98 +77,48 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>all_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <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>
<list>
<tuple>
- <string>property_tester</string>
- <string>Property Tester</string>
+ <string>tested_property</string>
+ <string>Property</string>
+ </tuple>
+ <tuple>
+ <string>message</string>
+ <string>Message</string>
+ </tuple>
+ <tuple>
+ <string>prevision_value</string>
+ <string>Prevision</string>
+ </tuple>
+ <tuple>
+ <string>decision_value</string>
+ <string>Decision</string>
+ </tuple>
+ <tuple>
+ <string>object_relative_url</string>
+ <string>Object</string>
</tuple>
<tuple>
- <string>solver_list</string>
- <string>Solver List</string>
+ <string>divergence_scope</string>
+ <string>Divergence Scope</string>
+ </tuple>
+ <tuple>
+ <string>getCollectOrderGroup</string>
+ <string>Collect Order Group</string>
</tuple>
</list>
</value>
</item>
<item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox</string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <int>10</int> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string>list</string> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
@@ -405,82 +126,18 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
- <item>
- <key> <string>meta_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>page_template</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>select</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>selection_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value>
- <list/>
- </value>
+ <value> <string>delivery_view_divergence_selection</string> </value>
</item>
<item>
- <key> <string>stat_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Divergence Messages</string> </value>
</item>
- <item>
- <key> <string>url_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
</dictionary>
</value>
</item>
@@ -498,7 +155,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>getDivergenceMessageList</string> </value>
+ <value> <string>getDivergenceList</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 0c7f592376..a7ff3ab009 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-604
\ No newline at end of file
+605
\ No newline at end of file
--
2.30.9