[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'

2 files changed, 4 insertions, 3 deletions

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) {
diff --git a/addons/web/static/src/js/views/kanban/kanban_controller.js b/addons/web/static/src/js/views/kanban/kanban_controller.js
index df944c2bd03..0c1c4bc3d59 100644
--- a/addons/web/static/src/js/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/js/views/kanban/kanban_controller.js
@@ -9,7 +9,7 @@ odoo.define('web.KanbanController', function (require) {
 
 var BasicController = require('web.BasicController');
 var core = require('web.core');
-var data = require('web.data');
+var Context = require('web.Context');
 var form_common = require('web.view_dialogs');
 
 var _t = core._t;
@@ -265,7 +265,7 @@ var KanbanController = BasicController.extend({
         var self = this;
         var record = event.target;
         if (event.data.context) {
-            event.data.context = new data.CompoundContext(event.data.context)
+            event.data.context = new Context(event.data.context)
                 .set_eval_context({
                     active_id: event.target.id,
                     active_ids: [event.target.id],