Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-deferred-rpc 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-rpc/+merge/128253
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-deferred-rpc/+merge/128253
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-deferred-rpc.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-10-05 11:30:46 +0000
+++ addons/web/static/src/js/chrome.js 2012-10-05 13:56:43 +0000
@@ -392,7 +392,7 @@
do_create: function(form) {
var self = this;
var fields = $(form).serializeArray();
- self.rpc("/web/database/create", {'fields': fields}, function(result) {
+ self.rpc("/web/database/create", {'fields': fields}).then(function(result) {
var form_obj = self.to_object(fields);
var client_action = {
type: 'ir.actions.client',
@@ -418,7 +418,7 @@
if (!db || !confirm("Do you really want to delete the database: " + db + " ?")) {
return;
}
- self.rpc("/web/database/drop", {'fields': fields}, function(result) {
+ self.rpc("/web/database/drop", {'fields': fields}).then(function(result) {
if (result.error) {
self.display_error(result);
return;
@@ -481,7 +481,7 @@
var self = this;
self.rpc("/web/database/change_password", {
'fields': $(form).serializeArray()
- }, function(result) {
+ }).then(function(result) {
if (result.error) {
self.display_error(result);
return;
@@ -660,7 +660,7 @@
submitHandler: function (form) {
self.rpc("/web/session/change_password",{
'fields': $(form).serializeArray()
- }, function(result) {
+ }).then(function(result) {
if (result.error) {
self.display_error(result);
return;
@@ -1165,8 +1165,13 @@
var self = this;
return $.when(this._super()).pipe(function() {
return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
+<<<<<<< TREE
return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
var action = result;
+=======
+ return self.rpc("/web/action/load", { action_id: self.action_id }).then(function(result) {
+ var action = result.result;
+>>>>>>> MERGE-SOURCE
action.flags = _.extend({
//views_switcher : false,
search_view : false,
=== modified file 'addons/web/static/src/js/corelib.js'
--- addons/web/static/src/js/corelib.js 2012-10-04 13:38:15 +0000
+++ addons/web/static/src/js/corelib.js 2012-10-05 13:56:43 +0000
@@ -842,7 +842,7 @@
rpc: function(url, data, success, error) {
var def = $.Deferred().then(success, error);
var self = this;
- instance.session.rpc(url, data). then(function() {
+ instance.session.rpc(url, data).then(function() {
if (!self.isDestroyed())
def.resolve.apply(def, arguments);
}, function() {
@@ -1300,7 +1300,7 @@
* @param {Function} error_callback function to execute on RPC call failure
* @returns {jQuery.Deferred} jquery-provided ajax deferred
*/
- rpc: function(url, params, success_callback, error_callback) {
+ rpc: function(url, params) {
var self = this;
// url can be an $.ajax option object
if (_.isString(url)) {
@@ -1359,7 +1359,7 @@
self.on_rpc_error(error, event);
}
});
- }).then(success_callback, error_callback).promise();
+ });
return deferred;
},
/**
=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js 2012-10-03 16:35:04 +0000
+++ addons/web/static/src/js/coresetup.js 2012-10-05 13:56:43 +0000
@@ -19,9 +19,9 @@
this.name = instance._session_id;
this.qweb_mutex = new $.Mutex();
},
- rpc: function(url, params, success_callback, error_callback) {
+ rpc: function(url, params) {
params.session_id = this.session_id;
- return this._super(url, params, success_callback, error_callback);
+ return this._super(url, params);
},
/**
* Setup a sessionm
=== modified file 'addons/web/static/src/js/data_export.js'
--- addons/web/static/src/js/data_export.js 2012-10-03 12:56:29 +0000
+++ addons/web/static/src/js/data_export.js 2012-10-05 13:56:43 +0000
@@ -51,7 +51,7 @@
self.rpc("/web/export/get_fields", {
model: self.dataset.model,
import_compat: Boolean(import_comp)
- }, function (records) {
+ }).then(function (records) {
got_fields.resolve();
self.on_show_data(records);
});
@@ -59,7 +59,7 @@
return $.when(
got_fields,
- this.rpc('/web/export/formats', {}, this.do_setup_export_formats),
+ this.rpc('/web/export/formats', {}).then(this.do_setup_export_formats),
this.show_exports_list());
},
do_setup_export_formats: function (formats) {
@@ -93,7 +93,7 @@
self.$el.find('#fields_list option').remove();
var export_id = self.$el.find('#saved_export_list option:selected').val();
if (export_id) {
- self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
+ self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}).then(self.do_load_export_field);
}
});
self.$el.find('#delete_export_list').click(function() {
@@ -183,7 +183,7 @@
import_compat: Boolean(import_comp),
parent_field_type : record['field_type'],
exclude: exclude_fields
- }, function(results) {
+ }).then(function(results) {
record.loaded = true;
self.on_show_data(results, record.id);
});
=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js 2012-10-02 22:07:20 +0000
+++ addons/web/static/src/js/search.js 2012-10-05 13:56:43 +0000
@@ -1693,7 +1693,7 @@
});
return $.when(
this._super(),
- this.rpc("/web/searchview/fields_get", {model: this.view.model}, function(data) {
+ this.rpc("/web/searchview/fields_get", {model: this.view.model}).then(function(data) {
self.fields = _.extend({
id: { string: 'ID', type: 'id' }
}, data.fields);
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-10-05 13:55:28 +0000
+++ addons/web/static/src/js/view_form.js 2012-10-05 13:56:43 +0000
@@ -4489,7 +4489,7 @@
self.rpc('/web/session/eval_domain_and_context', {
domains: [],
contexts: [this.context]
- }, function (results) {
+ }).then(function (results) {
var search_defaults = {};
_.each(results.context, function (value_, key) {
var match = /^search_default_(.*)$/.exec(key);
@@ -4557,7 +4557,7 @@
domains: domains || [],
contexts: contexts || [],
group_by_seq: groupbys || []
- }, function (results) {
+ }).then(function (results) {
self.view_list.do_search(results.domain, results.context, results.group_by);
});
},
=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js 2012-09-30 15:03:29 +0000
+++ addons/web/static/src/js/view_list.js 2012-10-05 13:56:43 +0000
@@ -482,7 +482,7 @@
view_type: "tree",
context: this.dataset.get_context(context),
toolbar: !!this.options.$sidebar
- }, callback);
+ }).then(callback);
}
},
/**
=== modified file 'addons/web/static/src/js/view_tree.js'
--- addons/web/static/src/js/view_tree.js 2012-08-24 18:27:07 +0000
+++ addons/web/static/src/js/view_tree.js 2012-10-05 13:56:43 +0000
@@ -45,7 +45,7 @@
view_type: "tree",
toolbar: this.view_manager ? !!this.view_manager.sidebar : false,
context: this.dataset.get_context()
- }, this.on_loaded);
+ }).then(this.on_loaded);
},
/**
* Returns the list of fields needed to correctly read objects.
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-10-05 11:30:46 +0000
+++ addons/web/static/src/js/views.js 2012-10-05 13:56:43 +0000
@@ -654,7 +654,7 @@
domains: [this.action.domain || []].concat(domains || []),
contexts: [action_context].concat(contexts || []),
group_by_seq: groupbys || []
- }, function (results) {
+ }).then(function (results) {
self.dataset._model = new instance.web.Model(
self.dataset.model, results.context, results.domain);
var groupby = results.group_by.length
@@ -1060,7 +1060,7 @@
self.rpc("/web/action/load", {
action_id: item.action.id,
context: additional_context
- }, function(result) {
+ }).then(function(result) {
result.result.context = _.extend(result.result.context || {},
additional_context);
result.result.flags = result.result.flags || {};
@@ -1239,7 +1239,7 @@
args.push(context);
return dataset.call_button(action_data.name, args).then(handler);
} else if (action_data.type=="action") {
- return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}, handler);
+ return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}).then(handler);
} else {
return dataset.exec_workflow(record_id, action_data.name).then(handler);
}
=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js 2012-10-01 22:02:48 +0000
+++ addons/web_calendar/static/src/js/calendar.js 2012-10-05 13:56:43 +0000
@@ -41,7 +41,7 @@
},
start: function() {
this._super();
- return this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': false}, this.on_loaded);
+ return this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': false}).then(this.on_loaded);
},
destroy: function() {
scheduler.clearAll();
=== modified file 'addons/web_diagram/static/src/js/diagram.js'
--- addons/web_diagram/static/src/js/diagram.js 2012-08-27 05:01:51 +0000
+++ addons/web_diagram/static/src/js/diagram.js 2012-10-05 13:56:43 +0000
@@ -105,8 +105,7 @@
});
this.rpc(
- '/web_diagram/diagram/get_diagram_info',params,
- function(result) {
+ '/web_diagram/diagram/get_diagram_info',params).then(function(result) {
self.draw_diagram(result);
}
);
_______________________________________________
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
