From 2c571f1114d983b656872261b71eadb50df946ec Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 20 Nov 2015 10:33:22 +0100 Subject: [FIX] web: method `BufferedDataSet._update_cache` must purge `changes` from useless changes --- addons/web/static/src/js/framework/data.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/web/static/src/js/framework') diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js index 8dd34cd4b93..e92bbd98c53 100644 --- a/addons/web/static/src/js/framework/data.js +++ b/addons/web/static/src/js/framework/data.js @@ -761,6 +761,12 @@ var BufferedDataSet = DataSetStatic.extend({ _.extend(cached.from_read, options.from_read); _.extend(cached.changes, options.changes); _.extend(cached.readonly_fields, options.readonly_fields); + // discard values from cached.changes that are in cached.from_read + _.each(cached.changes, function (v, k) { + if (cached.from_read[k] === v) { + delete cached.changes[k]; + } + }); if (options.to_create !== undefined) cached.to_create = options.to_create; if (options.to_delete !== undefined) cached.to_delete = options.to_delete; } -- cgit v1.2.3 From f5bd1cc922636814f24b50d02012a2ac818ae217 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Wed, 25 Nov 2015 10:59:21 +0100 Subject: [FIX] web: local var parent typo fixes #8516 note: was already solved in enterprise with 7ab5075 --- addons/web/static/src/js/framework/mixins.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/framework') diff --git a/addons/web/static/src/js/framework/mixins.js b/addons/web/static/src/js/framework/mixins.js index e9f9b2c94b0..c80f486b92b 100644 --- a/addons/web/static/src/js/framework/mixins.js +++ b/addons/web/static/src/js/framework/mixins.js @@ -277,6 +277,7 @@ var EventDispatcherMixin = _.extend({}, ParentedMixin, { this._trigger_up(event); }, _trigger_up: function(event) { + var parent; this.__edispatcherEvents.trigger(event.name, event); if (!event.is_stopped() && (parent = this.getParent())) { parent._trigger_up(event); -- cgit v1.2.3