From 83a16a237479e45177f9a2d0b638fb52b1b6a128 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 4 Oct 2012 16:13:51 +0200 Subject: [PATCH] [IMP] minor modifs in form view for future refactoring bzr revid: nicolas.vanhoren@openerp.com-20121004141351-4m0bjan8dax2tfcz --- addons/web/static/src/js/view_form.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1c32d5ef63e..68e79d60cea 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1694,8 +1694,9 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi */ init: function(field_manager, node) { this._super(field_manager); - this.view = field_manager; this.field_manager = field_manager; + if (this.field_manager instanceof instance.web.FormView) + this.view = this.field_manager; this.node = node; this.modifiers = JSON.parse(this.node.attrs.modifiers || '{}'); instance.web.form.InvisibilityChangerMixin.init.call(this, this.field_manager, this.modifiers.invisible); @@ -2015,11 +2016,11 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w renderElement: function() { var self = this; this._super(); - if (this.field.translate) { + if (this.field.translate && this.view) { this.$el.addClass('oe_form_field_translatable'); this.$el.find('.oe_field_translate').click(this.on_translate); } - this.$label = this.view.$el.find('label[for=' + this.id_for_label + ']'); + this.$label = this.view ? this.view.$el.find('label[for=' + this.id_for_label + ']') : $(); if (instance.session.debug) { this.do_attach_tooltip(this, this.$label[0] || this.$el); this.$label.off('dblclick').on('dblclick', function() { @@ -3879,7 +3880,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in }, render_value: function() { var self = this; - var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context()); + var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context()); var values = self.get("value") var handle_names = function(data) { var indexed = {};