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

[IMP]replace callbackenable from dateset on_change event. 

bzr revid: vme@tinyerp.com-20121011094132-9a752zxib2rpy4ji
This commit is contained in:
Vidhin Mehta (OpenERP) 2012-10-11 15:11:32 +05:30
parent f44ea704fe
commit dd747c0962
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/static/src/js/data.js
View File

@ -834,7 +834,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
} }
$.extend(cached.values, record.values); $.extend(cached.values, record.values);
if (dirty) if (dirty)
this.on_change(); this.trigger("dataset_on_change");
return $.Deferred().resolve(true).promise(); return $.Deferred().resolve(true).promise();
}, },
unlink: function(ids, callback, error_callback) { unlink: function(ids, callback, error_callback) {
@ -848,7 +848,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
this.to_write = _.reject(this.to_write, function(x) { return _.include(ids, x.id);}); this.to_write = _.reject(this.to_write, function(x) { return _.include(ids, x.id);});
this.cache = _.reject(this.cache, function(x) { return _.include(ids, x.id);}); this.cache = _.reject(this.cache, function(x) { return _.include(ids, x.id);});
this.set_ids(_.without.apply(_, [this.ids].concat(ids))); this.set_ids(_.without.apply(_, [this.ids].concat(ids)));
this.on_change(); this.trigger("dataset_on_change");
return $.async_when({result: true}).then(callback); return $.async_when({result: true}).then(callback);
}, },
reset_ids: function(ids) { reset_ids: function(ids) {
@ -859,8 +859,6 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
this.cache = []; this.cache = [];
this.delete_all = false; this.delete_all = false;
}, },
on_change: function() {
},
read_ids: function (ids, fields, options) { read_ids: function (ids, fields, options) {
var self = this; var self = this;
var to_get = []; var to_get = [];
@ -947,7 +945,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
}, },
alter_ids: function(n_ids) { alter_ids: function(n_ids) {
this._super(n_ids); this._super(n_ids);
this.on_change(); this.trigger("dataset_on_change");
}, },
}); });
instance.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/; instance.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/;

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

@ -3284,7 +3284,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
this.dataset.o2m = this; this.dataset.o2m = this;
this.dataset.parent_view = this.view; this.dataset.parent_view = this.view;
this.dataset.child_name = this.name; this.dataset.child_name = this.name;
this.dataset.on_change.add_last(function() { this.dataset.on('dataset_on_change', this, function() {
self.trigger_on_change(); self.trigger_on_change();
}); });
@ -3581,7 +3581,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
create_function: function(data) { create_function: function(data) {
return self.o2m.dataset.create(data).then(function(r) { return self.o2m.dataset.create(data).then(function(r) {
self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r])); self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r]));
self.o2m.dataset.on_change(); self.o2m.dataset.trigger("dataset_on_change");
}); });
}, },
write_function: function(id, data, options) { write_function: function(id, data, options) {
@ -3671,7 +3671,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
create_function: function(data, callback, error_callback) { create_function: function(data, callback, error_callback) {
return self.o2m.dataset.create(data).then(function(r) { return self.o2m.dataset.create(data).then(function(r) {
self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r])); self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r]));
self.o2m.dataset.on_change(); self.o2m.dataset.trigger("dataset_on_change");
}).then(callback, error_callback); }).then(callback, error_callback);
}, },
read_function: function() { read_function: function() {