Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-fix-getparent-error-with-menuitem-cto into lp:openerp-web/7.0

  1. 7.0-fix-getparent-error-with-menuitem-cto
  2. Merge into 7.0
Proposed by Martin Trigaux (OpenERP)
Status: Merged
Merged at revision: 4144
Proposed branch: lp:~openerp-dev/openerp-web/7.0-fix-getparent-error-with-menuitem-cto
Merge into: lp:openerp-web/7.0
Diff against target: 31 lines (+6/-3)
2 files modified
addons/web/static/src/js/view_list.js (+5/-2)
addons/web/static/src/js/views.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-fix-getparent-error-with-menuitem-cto
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+206686@code.launchpad.net

Description of the change

fixing another getParent issue

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Merged in web 7.0, thanks

revno: 4144 [merge]
revision-id: <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_list.js'
2--- addons/web/static/src/js/view_list.js 2014-01-15 11:00:38 +0000
3+++ addons/web/static/src/js/view_list.js 2014-02-17 10:56:39 +0000
4@@ -1623,9 +1623,12 @@
5 function synchronized(fn) {
6 var fn_mutex = new $.Mutex();
7 return function () {
8+ var obj = this;
9 var args = _.toArray(arguments);
10- args.unshift(this);
11- return fn_mutex.exec(fn.bind.apply(fn, args));
12+ return fn_mutex.exec(function () {
13+ if (obj.isDestroyed()) { return $.when(); }
14+ return fn.apply(obj, args)
15+ });
16 };
17 }
18 var DataGroup = instance.web.Class.extend({
19
20=== modified file 'addons/web/static/src/js/views.js'
21--- addons/web/static/src/js/views.js 2014-01-31 10:28:36 +0000
22+++ addons/web/static/src/js/views.js 2014-02-17 10:56:39 +0000
23@@ -1301,7 +1301,7 @@
24 "context": this.dataset.get_context(),
25 });
26 }
27- return view_loaded_def.then(function(r) {
28+ return this.alive(view_loaded_def).then(function(r) {
29 self.fields_view = r;
30 // add css classes that reflect the (absence of) access rights
31 self.$el.addClass('oe_view')