diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-27 14:08:38 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-27 14:08:38 +0200 |
| commit | 43235e2d1dc0ecc66d9a53d97bcb495709f7a9cb (patch) | |
| tree | ec025828254f71675559fd7ddcef51abbdd9a2bb /addons/web_view_editor/static/src/js | |
| parent | f304fb7f06e6dfbeb1cd72dfe6ed5092a0fa68c8 (diff) | |
| parent | 0e151f7f32d8965bcaadc661b7e091490762b903 (diff) | |
[MERGE] forward port of branch 7.0 up to 0e151f7
Diffstat (limited to 'addons/web_view_editor/static/src/js')
| -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 69e9a3080b7..6d0eb9e7fdc 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -532,6 +532,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; @@ -996,7 +998,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) { |