summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2014-10-15 09:44:31 +0200
committerDenis Ledoux <dle@odoo.com>2014-10-15 09:44:31 +0200
commit6feb5f70e9069d5e221b6cf3a6e53fc12409ecee (patch)
treef7fa28a3b6a6ebaa3bb41f12e0ecfa2efb0d2d3d /addons/web/static/src
parent9b17619ef12d0fb6590422a2cadd6313bcb8b7df (diff)
parent98c6e7c3d5a3d88193be8b8a9c4e617de88bca99 (diff)
[MERGE] forward port of branch 7.0 up to 98c6e7c
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d0951b6537e..96c821abb11 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2262,7 +2262,10 @@ instance.web.form.ReinitializeWidgetMixin = {
instance.web.form.ReinitializeFieldMixin = _.extend({}, instance.web.form.ReinitializeWidgetMixin, {
reinitialize: function() {
instance.web.form.ReinitializeWidgetMixin.reinitialize.call(this);
- this.view.render_value_defs.push(this.render_value());
+ var res = this.render_value();
+ if (this.view && this.view.render_value_defs){
+ this.view.render_value_defs.push(res);
+ }
},
});