[Erp5-report] r33749 kazuhiko - in /erp5/trunk/bt5/erp5_simulation: SkinTemplateItem/portal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 16 10:33:53 CET 2010
Author: kazuhiko
Date: Tue Mar 16 10:33:51 2010
New Revision: 33749
URL: http://svn.erp5.org?rev=33749&view=rev
Log:
* make listbox column titles more understandable for users.
* remove the 'Delivery Solver' column, that should be merged into the 'Parameters' column.
Added:
erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml
Removed:
erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml
Modified:
erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml
erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml
erp5/trunk/bt5/erp5_simulation/bt/revision
Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml [utf8] Tue Mar 16 10:33:51 2010
@@ -92,11 +92,10 @@
<key> <string>hidden</string> </key>
<value>
<list>
- <string>listbox_divergence</string>
<string>listbox_solver_configuration</string>
<string>listbox_solver</string>
- <string>listbox_delivery_solver</string>
<string>listbox_comment</string>
+ <string>listbox_divergence</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml [utf8] Tue Mar 16 10:33:51 2010
@@ -358,7 +358,62 @@
<list>
<tuple>
<string>divergence</string>
- <string>Divergence</string>
+ <string>Divergence Description</string>
+ </tuple>
+ <tuple>
+ <string>solver</string>
+ <string>Divergence Resolution</string>
+ </tuple>
+ <tuple>
+ <string>solver_configuration</string>
+ <string>Parameters</string>
+ </tuple>
+ <tuple>
+ <string>comment</string>
+ <string>Comment</string>
+ </tuple>
+ </list>
+ </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>
+ <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>
+ <tuple>
+ <string>divergence</string>
+ <string>Divergence Description</string>
</tuple>
<tuple>
<string>solver</string>
@@ -366,11 +421,7 @@
</tuple>
<tuple>
<string>solver_configuration</string>
- <string>Target Solver Configuration</string>
- </tuple>
- <tuple>
- <string>delivery_solver</string>
- <string>Delivery Solver</string>
+ <string>Parameters</string>
</tuple>
<tuple>
<string>comment</string>
@@ -380,61 +431,6 @@
</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>
- <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>
- <tuple>
- <string>solver</string>
- <string>Target Solver</string>
- </tuple>
- <tuple>
- <string>solver_configuration</string>
- <string>Target Solver Configuration</string>
- </tuple>
- <tuple>
- <string>delivery_solver</string>
- <string>Delivery Solver</string>
- </tuple>
- <tuple>
- <string>comment</string>
- <string>Comment</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
@@ -553,7 +549,12 @@
<item>
<key> <string>url_columns</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>divergence</string>
+ <string></string>
+ </tuple>
+ </list>
</value>
</item>
</dictionary>
Removed: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml?rev=33748&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml (removed)
@@ -1,132 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>items</string>
- <string>title</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>listbox_delivery_solver</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_radio_field</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Delivery Solver</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:cell.SolverDecision_getDeliverySolverList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_divergence.xml [utf8] Tue Mar 16 10:33:51 2010
@@ -3,12 +3,21 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="StringField" module="Products.Formulator.StandardFields"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>default</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_divergence</string> </value>
@@ -21,14 +30,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -37,71 +38,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</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>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -112,73 +57,21 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>description</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_maxwidth</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</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>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -189,72 +82,24 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_text_content</string> </value>
</item>
<item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </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>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>listbox_divergence</string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
+ <value> <string>Divergence Description</string> </value>
</item>
</dictionary>
</value>
@@ -273,7 +118,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/getCausalityTitle</string> </value>
+ <value> <string>cell/SolverDecision_getDivergenceDescription</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml?rev=33749&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml (added)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml [utf8] Tue Mar 16 10:33:51 2010
@@ -1,0 +1,142 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+from Products.PythonScripts.standard import html_quote\n
+\n
+# even if we have several divergence testers, the first\n
+# one is enough for displaying the title.\n
+tester = context.getCausalityValue()\n
+return \'<div>%s</div><div>(%s)</div>\' % (\n
+ html_quote(tester.getTranslatedTitle()),\n
+ context.getExplanationMessage())\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>Products.PythonScripts.standard</string>
+ <string>html_quote</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>tester</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>SolverDecision_getDivergenceDescription</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_simulation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/bt/revision?rev=33749&r1=33748&r2=33749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] Tue Mar 16 10:33:51 2010
@@ -1,1 +1,1 @@
-64
+66
More information about the Erp5-report
mailing list