summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome/view_manager.js2
-rw-r--r--addons/web/static/src/js/views/abstract_view.js2
-rw-r--r--addons/web/static/src/js/views/form/form_view.js8
3 files changed, 7 insertions, 5 deletions
diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js
index 978271d9228..502f1f2c5b6 100644
--- a/addons/web/static/src/js/chrome/view_manager.js
+++ b/addons/web/static/src/js/chrome/view_manager.js
@@ -354,7 +354,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
var self = this;
var arch = view.fields_view.arch;
var View = this.registry.get(arch.attrs.js_class || view.type);
- var params = _.extend({}, view_options);
+ var params = _.extend({}, view_options, {userContext: this.getSession().user_context});
if (view.type === "form" && ((this.action.target === 'new' || this.action.target === 'inline') ||
(view_options && view_options.mode === 'edit'))) {
params.mode = params.initial_mode || 'edit';
diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index e1066e56e92..fdb029da6c3 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -102,6 +102,8 @@ var AbstractView = Class.extend({
if (params.modelName) {
this.loadParams.modelName = params.modelName;
}
+
+ this.userContext = params.userContext;
},
//--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/views/form/form_view.js b/addons/web/static/src/js/views/form/form_view.js
index 2a1eb2b4da5..4fff1a74ee4 100644
--- a/addons/web/static/src/js/views/form/form_view.js
+++ b/addons/web/static/src/js/views/form/form_view.js
@@ -64,16 +64,16 @@ var FormView = BasicView.extend({
attrs.limit = attrs.mode === "tree" ? 80 : 40;
if (attrs.Widget.prototype.useSubview && !(attrs.invisible && JSON.parse(attrs.invisible)) && !attrs.views[attrs.mode]) {
+ var context = {};
var regex = /'([a-z]*_view_ref)' *: *'(.*?)'/g;
var matches;
while (matches = regex.exec(attrs.context)) {
- self.loadParams.context[matches[1]] = matches[2];
+ context[matches[1]] = matches[2];
}
defs.push(parent.loadViews(
field.relation,
- new Context(self.loadParams.context),
- [[null, attrs.mode === 'tree' ? 'list' : attrs.mode]],
- {})
+ new Context(context, self.userContext),
+ [[null, attrs.mode === 'tree' ? 'list' : attrs.mode]])
.then(function (views) {
for (var viewName in views) {
attrs.views[viewName] = views[viewName];