Skip to content

erp5
erp5
Commit 93fd21de authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

* make listbox column titles more understandable for users. 

* remove the 'Delivery Solver' column, that should be merged into the 'Parameters' column.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33749 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cecf8769
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 327 deletions
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog.xml
View file @ 93fd21de
...@@ -92,11 +92,10 @@ ...@@ -92,11 +92,10 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_divergence</string>
<string>listbox_solver_configuration</string> <string>listbox_solver_configuration</string>
<string>listbox_solver</string> <string>listbox_solver</string>
<string>listbox_delivery_solver</string>
<string>listbox_comment</string> <string>listbox_comment</string>
<string>listbox_divergence</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox.xml
View file @ 93fd21de
...@@ -358,19 +358,15 @@ ...@@ -358,19 +358,15 @@
<list> <list>
<tuple> <tuple>
<string>divergence</string> <string>divergence</string>
<string>Divergence</string> <string>Divergence Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>solver</string> <string>solver</string>
<string>Target Solver</string> <string>Divergence Resolution</string>
</tuple> </tuple>
<tuple> <tuple>
<string>solver_configuration</string> <string>solver_configuration</string>
<string>Target Solver Configuration</string> <string>Parameters</string>
</tuple>
<tuple>
<string>delivery_solver</string>
<string>Delivery Solver</string>
</tuple> </tuple>
<tuple> <tuple>
<string>comment</string> <string>comment</string>
...@@ -415,17 +411,17 @@ ...@@ -415,17 +411,17 @@
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>divergence</string>
<string>Divergence Description</string>
</tuple>
<tuple> <tuple>
<string>solver</string> <string>solver</string>
<string>Target Solver</string> <string>Target Solver</string>
</tuple> </tuple>
<tuple> <tuple>
<string>solver_configuration</string> <string>solver_configuration</string>
<string>Target Solver Configuration</string> <string>Parameters</string>
</tuple>
<tuple>
<string>delivery_solver</string>
<string>Delivery Solver</string>
</tuple> </tuple>
<tuple> <tuple>
<string>comment</string> <string>comment</string>
...@@ -553,7 +549,12 @@ ...@@ -553,7 +549,12 @@
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
<value> <value>
<list/> <list>
<tuple>
<string>divergence</string>
<string></string>
</tuple>
</list>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_delivery_solver.xml deleted 100644 → 0
View file @ cecf8769
<?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>
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverDecision_getDivergenceDescription.xml 0 → 100644
View file @ 93fd21de
<?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>
bt5/erp5_simulation/bt/revision
View file @ 93fd21de
64 66
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7