[imp] cosmetic improvements in form view
bzr revid: nicolas.vanhoren@openerp.com-20120110144709-wamuhmj682pa2a07
This commit is contained in:
parent
756d989a87
commit
7f945253c7
|
@ -306,7 +306,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
|
||||||
},
|
},
|
||||||
do_onchange: function(widget, processed) {
|
do_onchange: function(widget, processed) {
|
||||||
var self = this;
|
var self = this;
|
||||||
var act = function() {
|
return this.on_change_mutex.exec(function() {
|
||||||
try {
|
try {
|
||||||
processed = processed || [];
|
processed = processed || [];
|
||||||
var on_change = widget.node.attrs.on_change;
|
var on_change = widget.node.attrs.on_change;
|
||||||
|
@ -333,8 +333,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
|
||||||
console.error(e);
|
console.error(e);
|
||||||
return $.Deferred().reject();
|
return $.Deferred().reject();
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
return this.on_change_mutex.exec(act);
|
|
||||||
},
|
},
|
||||||
on_processed_onchange: function(response, processed) {
|
on_processed_onchange: function(response, processed) {
|
||||||
try {
|
try {
|
||||||
|
@ -416,7 +415,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
|
||||||
*/
|
*/
|
||||||
do_save: function(success, prepend_on_create) {
|
do_save: function(success, prepend_on_create) {
|
||||||
var self = this;
|
var self = this;
|
||||||
var action = function() {
|
return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() {
|
||||||
try {
|
try {
|
||||||
var form_invalid = false,
|
var form_invalid = false,
|
||||||
values = {},
|
values = {},
|
||||||
|
@ -462,10 +461,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
|
||||||
console.error(e);
|
console.error(e);
|
||||||
return $.Deferred().reject();
|
return $.Deferred().reject();
|
||||||
}
|
}
|
||||||
};
|
});});
|
||||||
return this.mutating_mutex.exec(function() {
|
|
||||||
return self.is_initialized.pipe(action);
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
on_invalid: function() {
|
on_invalid: function() {
|
||||||
var msg = "<ul>";
|
var msg = "<ul>";
|
||||||
|
@ -526,14 +522,13 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
|
||||||
},
|
},
|
||||||
reload: function() {
|
reload: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
var act = function() {
|
return this.reload_mutex.exec(function() {
|
||||||
if (self.dataset.index == null || self.dataset.index < 0) {
|
if (self.dataset.index == null || self.dataset.index < 0) {
|
||||||
return $.when(self.on_button_new());
|
return $.when(self.on_button_new());
|
||||||
} else {
|
} else {
|
||||||
return self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded);
|
return self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded);
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
return this.reload_mutex.exec(act);
|
|
||||||
},
|
},
|
||||||
get_fields_values: function(blacklist) {
|
get_fields_values: function(blacklist) {
|
||||||
blacklist = blacklist || [];
|
blacklist = blacklist || [];
|
||||||
|
|
Loading…
Reference in New Issue