diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml index 85f69592ec7a30c809712d2f284359d8f97c5212..aac1dfaad65557b9a482a617fe7cabea4d011841 100644 --- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml +++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.xml @@ -62,8 +62,8 @@ # - Implement validation of matrix fields\n # - Implement validation of list fields\n #\n +from Products.ERP5Type.Message import translateString\n from Products.Formulator.Errors import ValidationError, FormValidationError\n -from ZTUtils import make_query\n \n request=context.REQUEST\n \n @@ -95,35 +95,14 @@ except FormValidationError, validation_errors:\n field_errors = form.ErrorFields(validation_errors)\n request.set(\'field_errors\', field_errors)\n return form(request)\n -else:\n - # for web mode, we should use \'view\' instead of passed form_id\n - # after \'Save & View\'.\n - if context.REQUEST.get(\'is_web_mode\', False) and \\\n - not editable_mode:\n - form_id = \'view\'\n \n - if not selection_index:\n - redirect_url = \'%s/%s?%s\' % (\n - context.absolute_url(),\n - form_id,\n - make_query({\'ignore_layout\':ignore_layout,\n - \'editable_mode\':editable_mode,\n - \'portal_status_message\':\'Data Updated.\',\n - })\n - )\n - else:\n - redirect_url = \'%s/%s?%s\' % (\n - context.absolute_url(),\n - form_id,\n - make_query({\'selection_index\':selection_index,\n - \'selection_name\':selection_name,\n - \'ignore_layout\':ignore_layout,\n - \'editable_mode\':editable_mode,\n - \'portal_status_message\':\'Data Updated.\',\n - })\n - )\n +# for web mode, we should use \'view\' instead of passed form_id\n +# after \'Save & View\'.\n +if request.get(\'is_web_mode\', False) and not editable_mode:\n + form_id = \'view\'\n \n -request[ \'RESPONSE\' ].redirect( redirect_url )\n +return context.Base_redirect(form_id,\n + keep_items=dict(portal_status_message=translateString(\'Data Updated.\')))\n ]]></string> </value> @@ -136,7 +115,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n </item> <item> <key> <string>_params</string> </key> - <value> <string>form_id, selection_index=0, selection_name=\'\', ignore_layout=0, editable_mode=1</string> </value> + <value> <string>form_id=\'view\', selection_index=0, selection_name=\'\', ignore_layout=0, editable_mode=1</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -167,11 +146,11 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <string>selection_name</string> <string>ignore_layout</string> <string>editable_mode</string> + <string>Products.ERP5Type.Message</string> + <string>translateString</string> <string>Products.Formulator.Errors</string> <string>ValidationError</string> <string>FormValidationError</string> - <string>ZTUtils</string> - <string>make_query</string> <string>_getattr_</string> <string>context</string> <string>request</string> @@ -189,7 +168,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <string>validation_errors</string> <string>field_errors</string> <string>False</string> - <string>redirect_url</string> + <string>dict</string> </tuple> </value> </item> @@ -202,6 +181,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <key> <string>func_defaults</string> </key> <value> <tuple> + <string>view</string> <int>0</int> <string></string> <int>0</int> diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml index c629c32f9fed0fcc84ded4122a5bf687e402617d..1256db5ee901380041458ca24c0c717ef6360749 100644 --- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml +++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml @@ -53,7 +53,8 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>from ZTUtils import make_query\n + <value> <string>from Products.ERP5Type.Message import translateString\n +\n request= context.REQUEST\n listbox = request.get(\'listbox\')\n line_list = context.Delivery_getSolverDecisionList(listbox=listbox)\n @@ -75,15 +76,9 @@ solver_process = line.getParentValue()\n solver_process.buildTargetSolverList()\n solver_process.solve()\n \n -redirect_url = \'%s/%s?%s\' % (\n - context.absolute_url(),\n - \'view\',\n - make_query({\'ignore_layout\':request.get(\'ignore_layout\', 1),\n - \'editable_mode\':request.get(\'editable_mode\', 1),\n - \'portal_status_message\':\'Divergence solvers started in background.\',\n - })\n - )\n -request[ \'RESPONSE\' ].redirect( redirect_url )\n +return context.Base_redirect(form_id,\n + keep_items=dict(portal_status_message=\n + translateString(\'Divergence solvers started in background.\')))\n </string> </value> </item> <item> @@ -94,7 +89,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n </item> <item> <key> <string>_params</string> </key> - <value> <string>listbox=[],**kw</string> </value> + <value> <string>form_id=\'view\', listbox=[], **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -114,16 +109,17 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>form_id</string> <string>listbox</string> <string>kw</string> - <string>ZTUtils</string> - <string>make_query</string> + <string>Products.ERP5Type.Message</string> + <string>translateString</string> <string>_getattr_</string> <string>context</string> <string>request</string> @@ -144,7 +140,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <string>_write_</string> <string>_apply_</string> <string>solver_process</string> - <string>redirect_url</string> + <string>dict</string> </tuple> </value> </item> @@ -157,6 +153,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n <key> <string>func_defaults</string> </key> <value> <tuple> + <string>view</string> <list/> </tuple> </value> diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision index 6d58c4e590bdd76fbff00cfc9505eedd3cc90f32..9d07aa0df55c353e18eea6f1b401946b5dad7bce 100644 --- a/bt5/erp5_simulation/bt/revision +++ b/bt5/erp5_simulation/bt/revision @@ -1 +1 @@ -109 \ No newline at end of file +111 \ No newline at end of file