diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-27 14:56:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-27 14:56:49 +0200 |
| commit | 9d6786bc4324fa94d4c73db70ccc83dec58c18c8 (patch) | |
| tree | 71ae5b4f4b6ef4f476625bc29accfa6ffa21fb22 /addons/web_view_editor/static/src | |
| parent | 809f19c9b795964c0ea3821feb8d4ee82d1c1cbc (diff) | |
| parent | 5e6ec89659b639942c4ca7774b0598a0b85a67be (diff) | |
[MERGE] forward port of branch 8.0 up to 5e6ec89
Diffstat (limited to 'addons/web_view_editor/static/src')
| -rw-r--r-- | addons/web_view_editor/static/src/js/view_editor.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 6471e090f85..f3c46796e10 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -530,6 +530,8 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0]; var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0]; var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null); + if(_.isUndefined(parent_tr)) + return; parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0]; _.each([tr, parent_tr],function(element) { var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; @@ -994,7 +996,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ type_widget.set_value(node.value); self.add_widget.push(type_widget); }); - table_selector.find("td[id^=]").attr("width","100px"); + table_selector.find("td[id^='']").attr("width","100px"); self.add_node_dialog.$el.find('#new_field').click(function() { model_data = new instance.web.DataSetSearch(self,'ir.model', null, null); model_data.read_slice([], {domain: [['model','=', self.model]]}).done(function(result) { |