Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

Merge pull request #493 from initOS/7.0-fix_m2x_options_for_view 

[FIX] 7.0 Fix JavaScript error: undefined variable 'widget.view'
7.0
Holger Brunn 2016-12-15 13:50:04 +01:00 committed by GitHub
parent 0bc4c3912a 018b2bbc44
commit 11784e40ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web_m2x_options/static/src/js/form.js
View File

@ -37,11 +37,11 @@ openerp.web_m2x_options = function (instance) {
if (p < 0) return; if (p < 0) return;
var key = option.substring(p + 1); // w/o 'web_m2x_options' prefix var key = option.substring(p + 1); // w/o 'web_m2x_options' prefix
// ... hence set from context ... // ... hence set from context ...
if (!_.isUndefined(widget.view.dataset.context[key])) { if (!_.isUndefined(widget.view) && !_.isUndefined(widget.view.dataset.context[key])) {
widget.view.ir_options[option] = widget.view.dataset.context[key]; widget.view.ir_options[option] = widget.view.dataset.context[key];
} }
// ... and (overwrite) from widget here ... // ... and (overwrite) from widget here ...
if (!_.isUndefined(widget.options[key])) { if (!_.isUndefined(widget.view) && !_.isUndefined(widget.options[key])) {
widget.view.ir_options[option] = widget.options[key]; widget.view.ir_options[option] = widget.options[key];
} }
// ... but don't overwrite from global parameters above // ... but don't overwrite from global parameters above