diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index d05dffa6f3f..ddee1523b98 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -377,6 +377,7 @@ class DataSet(openerpweb.Controller): @openerpweb.jsonrequest def get(self, request, model, ids, fields=False): return self.do_get(request, model, ids, fields) + def do_get(self, request, model, ids, fields=False): """ Fetches and returns the records of the model ``model`` whose ids are in ``ids``. @@ -402,8 +403,8 @@ class DataSet(openerpweb.Controller): record_map = dict((record['id'], record) for record in records) return [record_map[id] for id in ids if record_map.get(id)] + @openerpweb.jsonrequest - def load(self, req, model, id, fields): m = req.session.model(model) value = {} diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 126b3ba6bac..7d973504d38 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1055,7 +1055,7 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ .openerp div.m2o_contextmenu span.disabled { color: #C0C0C0; } -.top{ +.parent_top { vertical-align: text-top; } diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js index 647bf05de68..742059d9b5e 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/tree.js @@ -63,7 +63,7 @@ openerp.base.TreeView = openerp.base.View.extend({ textoftd = $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 1) +')').text(); if ($('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').length > 0) { $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '2px' }); - $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').addClass("top"); + $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').find('#parentimg').addClass("parent_top"); } else { $('tr #treerow_' + response[i].id).find('td:eq('+ (childlen - 2) +')').css({ paddingLeft : '35px' }); } diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 16973187604..45914c5a3c3 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -239,18 +239,18 @@ - - - + + + - - + + - +