[MERGE] forward port of branch 7.0 up to 98c6e7c

anilgs · Oct 15, 2014 · 6feb5f7 · 6feb5f7
2 parents 9b17619 + 98c6e7c
commit 6feb5f7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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);
+        }
     },
 });