summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic/basic_model.js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2017-02-23 10:36:13 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commit136292f6890ff730b5a9fd70eb503d4f6a0f9c4a (patch)
tree3ded3049b78c6c901acbdd1b5609d9f77bfd2b3e /addons/web/static/src/js/views/basic/basic_model.js
parent173896b62d2c2d3c4acc6be75c3396b29887e4fb (diff)
[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'
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_model.js')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js3
1 files changed, 2 insertions, 1 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) {