[REF] web: add ajax.rpc and change some dependencies
This commit is contained in:
@@ -119,6 +119,11 @@ function jsonpRpc(url, fct_name, params, settings) {
|
||||
});
|
||||
}
|
||||
|
||||
// helper function to make a rpc with a function name hardcoded to 'call'
|
||||
function rpc(url, params, settings) {
|
||||
return jsonRpc(url, 'call', params, settings);
|
||||
}
|
||||
|
||||
// helper
|
||||
function realSetTimeout (fct, millis) {
|
||||
var finished = new Date().getTime() + millis;
|
||||
@@ -363,6 +368,7 @@ var loadXML = (function () {
|
||||
return {
|
||||
jsonRpc: jsonRpc,
|
||||
jsonpRpc: jsonpRpc,
|
||||
rpc: rpc,
|
||||
loadCSS: loadCSS,
|
||||
loadJS: loadJS,
|
||||
loadXML: loadXML,
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
odoo.define('web.data', function (require) {
|
||||
"use strict";
|
||||
|
||||
var core = require('web.core');
|
||||
var Class = require('web.Class');
|
||||
var mixins = require('web.mixins');
|
||||
var Model = require('web.Model');
|
||||
var session = require('web.session');
|
||||
var translation = require('web.translation');
|
||||
var pyeval = require('web.pyeval');
|
||||
var utils = require('web.utils');
|
||||
|
||||
var Class = core.Class;
|
||||
var mixins = core.mixins;
|
||||
var _t = core._t;
|
||||
var _t = translation._t;
|
||||
|
||||
/**
|
||||
* Serializes the sort criterion array of a dataset into a form which can be
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
odoo.define('web.formats', function (require) {
|
||||
"use strict";
|
||||
|
||||
var core = require('web.core');
|
||||
var translation = require('web.translation');
|
||||
var time = require('web.time');
|
||||
var utils = require('web.utils');
|
||||
|
||||
var _t = core._t;
|
||||
var _t = translation._t;
|
||||
|
||||
/**
|
||||
* Formats a single atomic value based on a field descriptor
|
||||
|
||||
@@ -3,7 +3,7 @@ odoo.define('web.framework', function (require) {
|
||||
|
||||
var core = require('web.core');
|
||||
var crash_manager = require('web.crash_manager');
|
||||
var session = require('web.session');
|
||||
var ajax = require('web.ajax');
|
||||
var Widget = require('web.Widget');
|
||||
|
||||
var _t = core._t;
|
||||
@@ -89,7 +89,7 @@ function redirect (url, wait) {
|
||||
};
|
||||
|
||||
var wait_server = function() {
|
||||
session.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
|
||||
ajax.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
|
||||
setTimeout(wait_server, 250);
|
||||
});
|
||||
};
|
||||
@@ -165,7 +165,7 @@ core.action_registry.add("logout", logout);
|
||||
*/
|
||||
function ReloadContext (parent, action) {
|
||||
// side-effect of get_session_info is to refresh the session context
|
||||
session.rpc("/web/session/get_session_info", {}).then(function() {
|
||||
ajax.rpc("/web/session/get_session_info", {}).then(function() {
|
||||
Reload(parent, action);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user