[Erp5-report] r18040 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec  5 18:16:04 2007
New Revision: 18040

URL: http://svn.erp5.org?rev=18040&view=rev
Log:
Pressing enter key in a dialog triggers update action if the dialog has an update action. Otherwise, it will still trigger the default action.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml?rev=18040&r1=18039&r2=18040&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml Wed Dec  5 18:16:04 2007
@@ -55,7 +55,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 string:Base_callDialogMethod;\n
+    <tal:block tal:define="form_action python: form.update_action or \'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
@@ -78,10 +78,9 @@
                  tal:condition="python: form.update_action!=\'\'"\n
                  id="dialog_update_button"\n
                  name="Base_showUpdateDialog:method" type="submit" />\n
-          <input tal:attributes="value python: here.Base_getFormViewDialogActionButtonTitle(form);\n
-                 name string:${form_action}:method"\n
+          <input tal:attributes="value python: here.Base_getFormViewDialogActionButtonTitle(form);"\n
                  i18n:attributes="value" i18n:domain="ui" accesskey="V"\n
-                 id="dialog_submit_button" type="submit" />\n
+                 id="dialog_submit_button" type="submit" name="Base_callDialogMethod:method" />\n
         </tal:block>\n
       </tal:block>\n
     </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=18040&r1=18039&r2=18040&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Wed Dec  5 18:16:04 2007
@@ -1,1 +1,1 @@
-455
+456