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

[FIX] layouting of groups when row with too fee cols 

bzr revid: fp@tinyerp.com-20120604210031-omhqeaim4g4gogsj
This commit is contained in:
Fabien Pinckaers 2012-06-04 23:00:31 +02:00
parent eefd98c603
commit 32002a6852
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1136,6 +1136,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
$td.addClass('oe_vertical_separator').attr('width', '1');
$td.empty();
row_cols-= $td.attr('colspan') || 1;
total--;
}
break;
case 'label':
@ -1158,20 +1159,22 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
}
$td.attr('width', width);
$child.removeAttr('width');
row_cols-= $td.attr('colspan') || 1;
} else {
to_compute.push($td);
}
row_cols-= $td.attr('colspan') || 1;
}
});
var unit = Math.floor(total / row_cols);
if (!row_cols && !$(this).is('.oe_form_group_row_incomplete')) {
_.each(to_compute, function($td, i) {
var width = parseInt($td.attr('colspan'), 10) * unit;
$td.attr('width', ((i == to_compute.length - 1) ? total : width) + '%');
total -= width;
});
if (row_cols) {
var unit = Math.floor(total / row_cols);
if (!$(this).is('.oe_form_group_row_incomplete')) {
_.each(to_compute, function($td, i) {
var width = parseInt($td.attr('colspan'), 10) * unit;
$td.attr('width', width + '%');
total -= width;
});
}
}
});
_.each(children, function(el) {