Fix: colspan for extrafields
This commit is contained in:
parent
2d6b5e377c
commit
266b413139
@ -2303,7 +2303,7 @@ abstract class CommonObject
|
|||||||
$label = '<span class="fieldrequired">'.$label.'</span>';
|
$label = '<span class="fieldrequired">'.$label.'</span>';
|
||||||
|
|
||||||
$out .= '<td>'.$label.'</td>';
|
$out .= '<td>'.$label.'</td>';
|
||||||
$out .='<td colspan="'.$colspan.'">';
|
$out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
|
||||||
|
|
||||||
switch($mode) {
|
switch($mode) {
|
||||||
case "view":
|
case "view":
|
||||||
|
|||||||
@ -800,11 +800,11 @@ else
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Other attributes
|
// Other attributes
|
||||||
$parameters=array('colspan' => ' colspan="2"');
|
$parameters=array('colspan' => 0);
|
||||||
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
|
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
|
||||||
if (empty($reshook) && ! empty($extrafields->attribute_label))
|
if (empty($reshook) && ! empty($extrafields->attribute_label))
|
||||||
{
|
{
|
||||||
print $object->showOptionals($extrafields,'edit');
|
print $object->showOptionals($extrafields,'edit',$parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note (private, no output on invoices, propales...)
|
// Note (private, no output on invoices, propales...)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user