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-20120604204449-ci68yf3p1837170h
This commit is contained in:
Fabien Pinckaers 2012-06-04 22:44:49 +02:00
parent 9ab64b4414
commit eefd98c603
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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