From 136292f6890ff730b5a9fd70eb503d4f6a0f9c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Thu, 23 Feb 2017 10:36:13 +0100 Subject: [REF] web, *: move CompoundContext out of data.js We want to remove data.js, but we still need the CompoundContext class, so we take it out, and rename it 'Context' --- addons/web/static/src/js/views/basic/basic_model.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/views/basic') diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index c2855c8aaa4..2028127c202 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -79,6 +79,7 @@ odoo.define('web.BasicModel', function (require) { var AbstractModel = require('web.AbstractModel'); var concurrency = require('web.concurrency'); +var Context = require('web.Context'); var data = require('web.data'); // TODO: remove dependency to data.js var pyeval = require('web.pyeval'); var session = require('web.session'); @@ -1557,7 +1558,7 @@ var Model = AbstractModel.extend({ * @returns {Object} the evaluated context */ _getContext: function (element, options) { - var context = new data.CompoundContext(session.user_context, element.context); + var context = new Context(session.user_context, element.context); if (options && options.field) { var attrs = element.fieldAttrs[options.field]; if (attrs && attrs.context) { -- cgit v1.2.3