From ea6e7c4be421aeb1f9b23be0cfeee8161c4c2922 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 8 Sep 2011 13:10:24 +0200 Subject: [FIX] Signature change in DataSet.write had not been performed in child class BufferedDataSet, resulting in success callback not being correctly called on successful save of row lp bug: https://launchpad.net/bugs/842644 fixed bzr revid: xmo@openerp.com-20110908111024-qfr6xlrw9ecy7m6y --- addons/web/static/src/js/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/data.js') diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 4b4523a2723..f980b159825 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -616,7 +616,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({ to_return.resolve({result: cached.id}); return to_return.promise(); }, - write: function (id, data, callback) { + write: function (id, data, options, callback) { var self = this; var record = _.detect(this.to_create, function(x) {return x.id === id;}); record = record || _.detect(this.to_write, function(x) {return x.id === id;}); -- cgit v1.2.3 From b7ccdadc1784099a4f1d2853e106441397bd977f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 8 Sep 2011 13:11:36 +0200 Subject: [FIX] same signature change as xmo@openerp.com-20110908111024-qfr6xlrw9ecy7m6y, but on ReadOnlyDataSetSearch bzr revid: xmo@openerp.com-20110908111136-fa8hm5t1q5vxjb9i --- addons/web/static/src/js/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/data.js') diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index f980b159825..678e4ba7be8 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -721,7 +721,7 @@ openerp.web.ReadOnlyDataSetSearch = openerp.web.DataSetSearch.extend({ return to_return.promise(); }, on_create: function(data) {}, - write: function (id, data, callback) { + write: function (id, data, options, callback) { this.on_write(id, data); var to_return = $.Deferred().then(callback); setTimeout(function () {to_return.resolve({"result": true});}, 0); -- cgit v1.2.3 From bd5ee5973f127811d8719747e5e8100e3fe6ddb8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 12 Sep 2011 12:35:03 +0200 Subject: [FIX] jsdoc v3 fixes: @constructs needs an explicit name, @lends is mandatory to not make free-floating methods (interpreted as globals) bzr revid: xmo@openerp.com-20110912103503-0gpou4t50i2stycp --- addons/web/static/src/js/data.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'addons/web/static/src/js/data.js') diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 678e4ba7be8..0be8265e53c 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -29,7 +29,7 @@ openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataG * :js:func:`~openerp.web.DataGroup.list`, which is used to read the * content of the current grouping level. * - * @constructs + * @constructs openerp.web.DataGroup * @extends openerp.web.Widget * * @param {openerp.web.Session} session Current OpenERP session @@ -60,7 +60,7 @@ openerp.web.DataGroup = openerp.web.Widget.extend( /** @lends openerp.web.DataG openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.ContainerDataGroup# */ { /** * - * @constructs + * @constructs openerp.web.ContainerDataGroup * @extends openerp.web.DataGroup * * @param session @@ -197,7 +197,7 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.GrouplessDataGroup# */ { /** * - * @constructs + * @constructs openerp.web.GrouplessDataGroup * @extends openerp.web.DataGroup * * @param session @@ -220,7 +220,7 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends * A specialization of groupless data groups, relying on a single static * dataset as its records provider. * - * @constructs + * @constructs openerp.web.StaticDataGroup * @extends openerp.web.GrouplessDataGroup * @param {openep.web.DataSetStatic} dataset a static dataset backing the groups */ @@ -237,7 +237,7 @@ openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet * DateaManagement interface between views and the collection of selected * OpenERP records (represents the view's state?) * - * @constructs + * @constructs openerp.web.DataSet * @extends openerp.web.Widget * * @param {String} model the OpenERP model this dataset will manage @@ -507,7 +507,8 @@ openerp.web.DataSetStatic = openerp.web.DataSet.extend({ }); openerp.web.DataSetSearch = openerp.web.DataSet.extend({ /** - * @constructs + * @constructs openerp.web.DataSetSearch + * @extends openerp.web.DataSet * * @param {Object} parent * @param {String} model -- cgit v1.2.3 From 127364adcaad400aeba08e611975f51489d537ee Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 12 Sep 2011 14:06:04 +0200 Subject: [IMP] fix more jsdoc to not have any global extracted in jsdoc bzr revid: xmo@openerp.com-20110912120604-ojzbfhjkobgoueo6 --- addons/web/static/src/js/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/data.js') diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 0be8265e53c..ba423d75b2f 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -505,7 +505,7 @@ openerp.web.DataSetStatic = openerp.web.DataSet.extend({ this.set_ids(_.without.apply(null, [this.ids].concat(ids))); } }); -openerp.web.DataSetSearch = openerp.web.DataSet.extend({ +openerp.web.DataSetSearch = openerp.web.DataSet.extend(/** @lends openerp.web.DataSetSearch */{ /** * @constructs openerp.web.DataSetSearch * @extends openerp.web.DataSet -- cgit v1.2.3 From e10fbbe555702dbea5c0e01a4b1798ac3940c410 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 12 Sep 2011 17:58:37 +0200 Subject: [fix] problem in o2m when creating a record (hope this wont make something else crash) bzr revid: nicolas.vanhoren@openerp.com-20110912155837-ersyabu3jzc62wax --- addons/web/static/src/js/data.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/data.js') diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index ba423d75b2f..1eb57241fa6 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -613,6 +613,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({ var cached = {id:_.uniqueId(this.virtual_id_prefix), values: data}; this.to_create.push(cached); this.cache.push(cached); + this.on_change(); var to_return = $.Deferred().then(callback); to_return.resolve({result: cached.id}); return to_return.promise(); -- cgit v1.2.3