diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 3fba213fb4a..1eef82275eb 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1085,8 +1085,9 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ vertical-align: top; } .treeview-td { - text-align: right; + text-align: left; vertical-align: top; + padding-left: 15px; } .treeview-header { text-align: left; diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js index 0c7b971d9ef..7b039bef3dd 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/tree.js @@ -64,13 +64,13 @@ openerp.base.TreeView = openerp.base.View.extend({ self.dataset.domain = [['parent_id', '=', parseInt(id, 10)]]; self.dataset.read_slice([], 0, false, function (response) { - var is_padding, row_id, record_id; var curr_node = $('tr #treerow_' + id); if (curr_node.length == 1) { curr_node.find('td').children(':first-child').attr('src','/base/static/src/img/collapse.gif'); - curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0' })); + curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0', 'selection_fields' : self.fields.type.selection })); + for (var i = 0; i < response.length; i++) { row_id = $('tr #treerow_' + response[i].id); @@ -109,11 +109,12 @@ openerp.base.TreeView = openerp.base.View.extend({ if (!flag) { self.$element.find('table').remove(); } - self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children })); + + self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children, 'selection_fields' : self.fields.type.selection})); self.$element.find('tr[id ^= treerow_]').each( function() { $(this).find('td').children(':first-child').addClass("parent_top"); if (!($(this).find('td').children(':first-child').attr('id'))) { - $(this).find('td').css('paddingLeft', '20px'); + $(this).find('td:first').css('paddingLeft', '20px'); } }); } diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index a9a1c4f505e..5b21ff376bb 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -271,7 +271,11 @@