Merge lp:~therp-nl/openerp-web/6.1-lp1048643-record_is_undefined into lp:openerp-web/6.1

[Holger Brunn (Therp)]

fix #1048643 and backport http://bazaar.launchpad.net/~openerp/openerp-web/trunk/revision/2863.1.6 to 6.1

[Stefan Rijnhart (Opener) (stefan-opener)]

review: Approve

Unmerged revisions

2456. By Holger Brunn (Therp) on 2012-09-10

[ADD] function openerp.web.callback.removeCode to remove anonymous
functions whose reference is not available
[FIX] update right row on subsequent calls to buttons which open a dialog

2455. By Xavier (Open ERP) on 2012-09-10

[MRG] backport http://bazaar.launchpad.net/~openerp/openerp-web/trunk/revision/2863.1.6

=== modified file 'addons/web/static/src/js/core.js'
--- addons/web/static/src/js/core.js	2012-08-31 12:13:20 +0000
+++ addons/web/static/src/js/core.js	2012-09-10 14:35:28 +0000
@@ -172,6 +172,15 @@
         return callback;
     };
 
+    //remove callbacks based on either exact reference or same code - convenient
+    //when we're busy with anonymous functions
+    callback.removeCode = function(f) {
+        callback.callback_chain = _.difference(callback.callback_chain, _.filter(callback.callback_chain, function(el) {
+            return el.callback === f || el.callback.toString() == f.toString();
+        }));
+        return callback;
+    }
+ 
     return callback.add({
         callback: method,
         self:obj,

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2012-06-25 07:20:46 +0000
+++ addons/web/static/src/js/view_list.js	2012-09-10 14:35:28 +0000
@@ -606,7 +606,8 @@
             c.add(action.context);
         }
         action.context = c;
-        this.do_execute_action(action, this.dataset, id, callback);
+        this.do_execute_action(
+            action, this.dataset, id, _.bind(callback, null, id));
     },
     /**
      * Handles the activation of a record (clicking on it)
@@ -869,8 +870,8 @@
                 // of digits, nice when storing actual numbers, not nice when
                 // storing strings composed only of digits. Force the action
                 // name to be a string
-                $(self).trigger('action', [field.toString(), record_id, function () {
-                    return self.reload_record(self.records.get(record_id));
+                $(self).trigger('action', [field.toString(), record_id, function (id) {
+                    return self.reload_record(self.records.get(id));
                 }]);
             })
             .delegate('a', 'click', function (e) {

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2012-06-29 10:53:25 +0000
+++ addons/web/static/src/js/views.js	2012-09-10 14:35:28 +0000
@@ -144,6 +144,10 @@
                     this.dialog.on_close.add(on_close);
             } else {
                 this.dialog_viewmanager.stop();
+                if(on_close) {
+                    this.dialog.on_close.removeCode(on_close);
+                    this.dialog.on_close.add(on_close);
+                }
             }
             this.dialog.dialog_title = action.name;
             this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);