Merge lp:~stan/openobject-client-web/ajaxo2m into lp:openobject-client-web/trunk

[Tristan Hill]

fix for https://bugs.launchpad.net/openobject-client-web/+bug/730894

[Xavier (Open ERP) (xmo-deactivatedaccount)]

While this looks like it fixes the issue from afar, it does not:

* Most if not all form submissions should be ajaxified by now, using delegation. In this precise case, the submission is routed to line 240 (in 6.0, not sure about the line in trnuk but it should be roughly the same) in the file 'openerp.base.js'. No need to create a "special" ajaxified version

* Furthermore, while the result *looks* ok by doing an urlencoded POST, the attached file is *not* sent to the server, only the name is correctly set.

I fear the underlying brokenness of binaries handling in the web client make this harder than a trivial fix (https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4009-al/+merge/50846 also tries to fix it, but it did not seem to work correctly in my tests, and it certainly does not fix this issue)

review: Disapprove

Unmerged revisions

4538. By Tristan Hill on 2011-03-17

[FIX] use ajax for one2many save and close which works in an iframe

=== modified file 'addons/openerp/controllers/templates/openo2m.mako'
--- addons/openerp/controllers/templates/openo2m.mako	2010-12-28 07:29:19 +0000
+++ addons/openerp/controllers/templates/openo2m.mako	2011-03-17 15:21:31 +0000
@@ -31,7 +31,7 @@
                         <tr>
                             % if form.screen.editable:
                                 <td class="save_close">
-                                    <button onclick="submit_form('save_and_close'); return false;" style="height: 20px;" class="button-a">${_("Save & Close")}</button>
+                                    <button onclick="ajax_submit_form('save_and_close'); return false;" style="height: 20px;" class="button-a">${_("Save & Close")}</button>
                                 </td>
                                 <td class="save_close">
                                     <button onclick="submit_form('save'); return false;" style="height: 20px;" class="button-a">${_("Save & New")}</button>

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2011-02-16 08:57:33 +0000
+++ addons/openerp/static/javascript/form.js	2011-03-17 15:21:31 +0000
@@ -210,7 +210,7 @@
 }
 
 
-function submit_form(action, src, target){
+function submit_form(action, src, target, ajax){
 
     if (openobject.http.AJAX_COUNT > 0) {
         callLater(1, submit_form, action, src, target);
@@ -245,8 +245,23 @@
     // action when creating an activity
     $form[0].setAttribute('action', action);
     $form.attr("target", target);
-    $form.submit();
-}
+    
+    if (ajax) {
+        jQuery.post(action, $form.serialize(),
+            function(data) {
+                $form.after(data);
+        });
+    } else {
+        $form.submit();
+    }
+    
+}
+
+
+function ajax_submit_form(action, src, target){
+	submit_form(action, src, target, true);
+}
+
 
 function pager_action(src){
     var $src = jQuery(src);