From 4a63c404edf2776d3f75a7c7eec3d55aa1abdbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 25 May 2009 13:27:41 +0000
Subject: [PATCH] Pressing enter in a dialog was calling the update method
directly, without passing through Base_showUpdateDialog (this is the script
used by the update button), that's why the form was not validated in that
case
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27158 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_xhtml_style/dialog_main.xml | 2 +-
product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
index 9c9cec0816..a9b5c35b2b 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
@@ -43,7 +43,7 @@
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
<tal:block metal:define-macro="master">\n
- <tal:block tal:define="form_action python: form.update_action or \'Base_callDialogMethod\';\n
+ <tal:block tal:define="form_action python: test(form.update_action, \'Base_showUpdateDialog\', \'Base_callDialogMethod\');\n
dialog_id form/id | template/id;\n
form_id request/form_id | string:view;\n
dialog_method form/action | dialog_id;\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 5d1d1b123b..d7a801b1e0 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-755
\ No newline at end of file
+757
\ No newline at end of file
--
2.30.9