Vidhin Mehta (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-deferred-call into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-deferred-call/+merge/127721
Remove callbacks from call method,update related code and tested with browser
debugger.Some changes are also in addons.
Branch : lp:~openerp-dev/openobject-addons/trunk-deferred-call.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-deferred-call/+merge/127721
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-deferred-call.
=== modified file 'addons/web/static/src/js/data.js'
--- addons/web/static/src/js/data.js 2012-10-01 22:36:30 +0000
+++ addons/web/static/src/js/data.js 2012-10-03 11:31:29 +0000
@@ -586,8 +586,8 @@
* @param {Function} error_callback
* @returns {$.Deferred}
*/
- call: function (method, args, callback, error_callback) {
- return this._model.call(method, args).then(callback, error_callback);
+ call: function (method, args) {
+ return this._model.call(method, args);
},
/**
* Calls an arbitrary method, with more crazy
=== modified file 'addons/web/static/test/fulltest/dataset.js'
--- addons/web/static/test/fulltest/dataset.js 2012-09-28 06:53:41 +0000
+++ addons/web/static/test/fulltest/dataset.js 2012-10-03 11:31:29 +0000
@@ -82,14 +82,14 @@
});
t.test('call', function (openerp) {
var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
- t.expect(ds.call('frob', ['a', 'b', 42]), function (r) {
+ t.expect(ds.call('frob', ['a', 'b', 42]).then(function (r) {
strictEqual(r.method, 'frob');
strictEqual(r.args.length, 3);
deepEqual(r.args, ['a', 'b', 42]);
ok(_.isEmpty(r.kwargs));
- });
+ }));
});
t.test('name_get').then(function (openerp) {
var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
=== modified file 'addons/web_view_editor/static/src/js/view_editor.js'
--- addons/web_view_editor/static/src/js/view_editor.js 2012-10-01 22:02:48 +0000
+++ addons/web_view_editor/static/src/js/view_editor.js 2012-10-03 11:31:29 +0000
@@ -136,7 +136,7 @@
var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
var model_dataset = new instance.web.DataSetSearch(this, 'ir.model', null, null);
var view_string = "", field_name = false, self = this;
- field_dataset.call( 'fields_get', [], function(fields) {
+ field_dataset.call( 'fields_get', []).then(function(fields) {
_.each(['name', 'x_name'], function(value) {
if (_.include(_.keys(fields), value)) {
field_name = value;
@@ -539,7 +539,7 @@
var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
property_to_check.push(value);
});
- field_dataset.call( 'fields_get', [], function(result) {
+ field_dataset.call( 'fields_get', []).then(function(result) {
var fields = _.keys(result);
fields.push(" "),fields.sort();
self.on_add_node(property_to_check, fields);
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
