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

[IMP] view_form remove used callback on do_save 

bzr revid: al@openerp.com-20120829102300-0a1m4f237wbmqzv4
This commit is contained in:
Antony Lesuisse 2012-08-29 12:23:00 +02:00
parent 6c58d3b296
commit b745a2038a
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,7 +689,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}, },
on_button_save: function() { on_button_save: function() {
var self = this; var self = this;
return this.do_save().then(function(result) { return this.do_save().then(function(result) {
self.to_view_mode(); self.to_view_mode();
}); });
}, },
@ -759,10 +759,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
* record or saving an existing one depending on whether the record * record or saving an existing one depending on whether the record
* already has an id property. * already has an id property.
* *
* @param {Function} [success] callback on save success * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new
* @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new record, should that record be inserted at the start of the dataset (by default, records are added at the end) * record, should that record be inserted at the start of the dataset (by
* default, records are added at the end)
*/ */
do_save: function(success, prepend_on_create) { do_save: function(prepend_on_create) {
var self = this; var self = this;
return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() { return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() {
try { try {
@ -797,21 +798,21 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
self.set({'display_invalid_fields': false}); self.set({'display_invalid_fields': false});
var save_deferral; var save_deferral;
if (!self.datarecord.id) { if (!self.datarecord.id) {
// console.log("FormView(", self, ") : About to create", values); // Creation save
save_deferral = self.dataset.create(values).pipe(function(r) { save_deferral = self.dataset.create(values).pipe(function(r) {
return self.on_created(r, undefined, prepend_on_create); return self.on_created(r, prepend_on_create);
}, null); }, null);
} else if (_.isEmpty(values) && ! self.force_dirty) { } else if (_.isEmpty(values) && ! self.force_dirty) {
// console.log("FormView(", self, ") : Nothing to save"); // Not dirty, noop save
save_deferral = $.Deferred().resolve({}).promise(); save_deferral = $.Deferred().resolve({}).promise();
} else { } else {
self.force_dirty = false; self.force_dirty = false;
// console.log("FormView(", self, ") : About to save", values); // Write save
save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) { save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) {
return self.on_saved(r); return self.on_saved(r);
}, null); }, null);
} }
return save_deferral.then(success); return save_deferral;
} }
} catch (e) { } catch (e) {
console.error(e); console.error(e);
@ -830,14 +831,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
warnings.push('</ul>'); warnings.push('</ul>');
this.do_warn("The following fields are invalid :", warnings.join('')); this.do_warn("The following fields are invalid :", warnings.join(''));
}, },
on_saved: function(r, success) { /**
* Reload the form after saving
*
* @param {Object} r result of the write function.
*/
on_saved: function(r) {
if (!r.result) { if (!r.result) {
// should not happen in the server, but may happen for internal purpose // should not happen in the server, but may happen for internal purpose
return $.Deferred().reject(); return $.Deferred().reject();
} else { } else {
return $.when(this.reload()).pipe(function () { return $.when(this.reload()).pipe(function () {
return r; }) return r;
.then(success); });
} }
}, },
/** /**
@ -850,10 +856,10 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
* * Updates the pager and sidebar displays * * Updates the pager and sidebar displays
* *
* @param {Object} r * @param {Object} r
* @param {Function} success callback to execute after having updated the dataset * @param {Boolean} [prepend_on_create=false] adds the newly created record
* @param {Boolean} [prepend_on_create=false] adds the newly created record at the beginning of the dataset instead of the end * at the beginning of the dataset instead of the end
*/ */
on_created: function(r, success, prepend_on_create) { on_created: function(r, prepend_on_create) {
if (!r.result) { if (!r.result) {
// should not happen in the server, but may happen for internal purpose // should not happen in the server, but may happen for internal purpose
return $.Deferred().reject(); return $.Deferred().reject();
@ -872,8 +878,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
} }
//openerp.log("The record has been created with id #" + this.datarecord.id); //openerp.log("The record has been created with id #" + this.datarecord.id);
return $.when(this.reload()).pipe(function () { return $.when(this.reload()).pipe(function () {
return _.extend(r, {created: true}); }) return _.extend(r, {created: true});
.then(success); });
} }
}, },
on_action: function (action) { on_action: function (action) {

2
addons/web/static/src/js/view_list_editable.js
View File

@ -716,7 +716,7 @@ openerp.web.list_editable = function (instance) {
save: function () { save: function () {
var self = this; var self = this;
return this.form return this.form
.do_save(null, this.delegate.prepends_on_create()) .do_save(this.delegate.prepends_on_create())
.pipe(function (result) { .pipe(function (result) {
var created = result.created && !self.record.id; var created = result.created && !self.record.id;
if (created) { if (created) {