odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Layout: add remaining colspan to last cell 

bzr revid: fme@openerp.com-20120326094418-1bk7ukruqzn6cbd6
This commit is contained in:
Fabien Meghazi 2012-03-26 11:44:18 +02:00
parent 6d90ea0966
commit ee9a1e8cee
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web/static/src/js/view_form.js
View File

@ -885,12 +885,13 @@ openerp.web.FormRenderingEngine = openerp.web.Class.extend({
$table = $new_group.find('table:first');
}
$table.addClass('oe_form_group');
var $tr,
var $tr, $td,
cols = parseInt($group.attr('col') || 4, 10),
row_cols = cols;
var children = [];
$group.children().each(function() {
$group.children().each(function(a,b,c) {
debugger
var $child = $(this),
colspan = parseInt($child.attr('colspan') || 1, 10),
tagName = $child[0].tagName.toLowerCase();
@ -903,10 +904,13 @@ openerp.web.FormRenderingEngine = openerp.web.Class.extend({
row_cols = cols;
}
row_cols -= colspan;
var $td = $('<td/>').addClass('oe_form_group_cell').attr('colspan', colspan);
$td = $('<td/>').addClass('oe_form_group_cell').attr('colspan', colspan);
$tr.append($td.append($child));
children.push($child[0]);
});
if (row_cols) {
$td.attr('colspan', parseInt($td.attr('colspan'), 10) + row_cols);
}
$group.before($new_group).remove();
// Now compute width of cells