summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-04-07 15:50:42 +0200
committerFabien Meghazi <fme@openerp.com>2011-04-07 15:50:42 +0200
commit56532b80be7c837dda97cc7e35c079af78c6a215 (patch)
tree0fb34901629e0d9f45d037f7c4e2972e4c06e2a9 /addons/base/static/src
parent16b7ad769f4fb4ea87213de3686e455770b02d17 (diff)
[ADD] in rpc_ajax, first parameter can be url or $.ajax option object (with url inside)
bzr revid: fme@openerp.com-20110407135042-plwyesu7o7minf9i
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/chrome.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index db2db6b91e5..3f2358d4a8c 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -283,7 +283,13 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
rpc_ajax: function(url, payload, success_callback, error_callback) {
var self = this;
this.on_rpc_request();
- return $.ajax({
+ // url can be an $.ajax option object
+ if (_.isString(url)) {
+ url = {
+ url: url
+ }
+ }
+ var ajax = _.extend({
type: "POST",
url: url,
dataType: 'json',
@@ -314,7 +320,8 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
};
error_callback(error);
}
- });
+ }, url);
+ return $.ajax(ajax);
},
on_rpc_request: function() {
},