odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] refactored a part of form view to use Mutex 

bzr revid: nicolas.vanhoren@openerp.com-20120110144113-1x67nu7u9q51g7ny
This commit is contained in:
niv-openerp 2012-01-10 15:41:13 +01:00
parent f0c294e584
commit 3dbb95ec2b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/web/static/src/js/view_form.js
View File

@ -50,8 +50,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
_.defaults(this.options, { _.defaults(this.options, {
"not_interactible_on_create": false "not_interactible_on_create": false
}); });
this.mutating_lock = $.Deferred(); this.is_initialized = $.Deferred();
this.initial_mutating_lock = this.mutating_lock; this.mutating_mutex = new $.Mutex();
this.on_change_lock = $.Deferred().resolve(); this.on_change_lock = $.Deferred().resolve();
this.reload_lock = $.Deferred().resolve(); this.reload_lock = $.Deferred().resolve();
}, },
@ -189,7 +189,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
}); });
} }
self.on_form_changed(); self.on_form_changed();
self.initial_mutating_lock.resolve(); self.is_initialized.resolve();
self.show_invalid = true; self.show_invalid = true;
self.do_update_pager(record.id == null); self.do_update_pager(record.id == null);
if (self.sidebar) { if (self.sidebar) {
@ -419,8 +419,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
var self = this; var self = this;
var action = function() { var action = function() {
try { try {
if (!self.initial_mutating_lock.isResolved() && !self.initial_mutating_lock.isRejected())
return;
var form_invalid = false, var form_invalid = false,
values = {}, values = {},
first_invalid_field = null; first_invalid_field = null;
@ -466,8 +464,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
return $.Deferred().reject(); return $.Deferred().reject();
} }
}; };
this.mutating_lock = this.mutating_lock.pipe(action, action); return this.mutating_mutex.exec(function() {
return this.mutating_lock; return self.is_initialized.pipe(action);
});
}, },
on_invalid: function() { on_invalid: function() {
var msg = "<ul>"; var msg = "<ul>";