[Erp5-report] r44142 leonardo - in /erp5/trunk/bt5/erp5_simulation: SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Mar 10 16:34:31 2011
New Revision: 44142

URL: http://svn.erp5.org?rev=44142&view=rev
Log:
Fix infinite recursion with Delivery_viewSolveDivergenceDialog. Do not enable (and so, do not try to validate) the solver configuration formbox if there is no solver.

Also make changes to make these kinds of errors easier to diagnose by having an explicitly invalid value as a fallback when the TALES expression fails.

Modified:
    erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
    erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
    erp5/trunk/bt5/erp5_simulation/bt/description
    erp5/trunk/bt5/erp5_simulation/bt/revision

Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml?rev=44142&r1=44141&r2=44142&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml [utf8] Thu Mar 10 16:34:31 2011
@@ -94,12 +94,14 @@
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -109,7 +111,7 @@
                 <item>
                     <key> <string>formbox_target_id</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -157,7 +159,7 @@
                 </item>
                 <item>
                     <key> <string>formbox_target_id</string> </key>
-                    <value> <string>Solver_viewConfiguration</string> </value>
+                    <value> <string>Delivery_viewSolveDivergenceDialog_form_id_should_come_from_TALES</string> </value>
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>
@@ -194,6 +196,19 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
+            <value> <string>cell/getSolver</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
             <value> <string>python:cell.getSolverValue().getConfigurationFormId()</string> </value>
         </item>
       </dictionary>

Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml?rev=44142&r1=44141&r2=44142&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml [utf8] Thu Mar 10 16:34:31 2011
@@ -155,7 +155,7 @@
                 </item>
                 <item>
                     <key> <string>formbox_target_id</string> </key>
-                    <value> <string>Solver_viewConfiguration</string> </value>
+                    <value> <string>Solver_viewConfiguration_form_id_should_come_from_TALES_override</string> </value>
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>

Modified: erp5/trunk/bt5/erp5_simulation/bt/description
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/bt/description?rev=44142&r1=44141&r2=44142&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/bt/description [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/bt/description [utf8] Thu Mar 10 16:34:31 2011
@@ -1 +1 @@
-This business templates contains abstract tools which are requires by all business templates based on the concept of Simulation.
\ No newline at end of file
+This business templates contains abstract tools which are required by all business templates based on the concept of Simulation.
\ No newline at end of file

Modified: erp5/trunk/bt5/erp5_simulation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/bt/revision?rev=44142&r1=44141&r2=44142&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/bt/revision [utf8] Thu Mar 10 16:34:31 2011
@@ -1 +1 @@
-149
\ No newline at end of file
+150
\ No newline at end of file