lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-24 14:14:04 +01:00
parent a6e7a41e98
commit ba3856f9e9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/extrafields.class.php
View File

@ -1886,7 +1886,7 @@ class ExtraFields
$out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'">'; $out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'">';
$out .= '<'.$tagtype_dyn.' '.(!empty($colspan)?'colspan="' . $colspan . '"':'').'>'; $out .= '<'.$tagtype_dyn.' '.(!empty($colspan)?'colspan="' . $colspan . '"':'').'>';
// Some js code will be injected here to manage the collapsing of extrafields // Some js code will be injected here to manage the collapsing of extrafields
$out .= '<span class="cursorpointer far fa-plus-square"></span>&nbsp;'; $out .= '<span class="cursorpointer far fa-'.($expand_display ? 'minus' : 'plus').'-square"></span>&nbsp;';
$out .= '<strong>'; $out .= '<strong>';
$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]); $out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
$out .= '</strong>'; $out .= '</strong>';

16
htdocs/core/class/html.form.class.php
View File

@ -141,9 +141,9 @@ class Form
} }
} }
} else { } else {
//if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if (empty($notabletag) && $perm) {
$ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">'; $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
//} }
if ($fieldrequired) { if ($fieldrequired) {
$ret .= '<span class="fieldrequired">'; $ret .= '<span class="fieldrequired">';
} }
@ -158,10 +158,10 @@ class Form
if (!empty($notabletag)) { if (!empty($notabletag)) {
$ret .= ' '; $ret .= ' ';
} }
//if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if (empty($notabletag) && $perm) {
$ret .= '</td>'; $ret .= '</td>';
//} }
if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if (empty($notabletag) && $perm) {
$ret .= '<td class="right">'; $ret .= '<td class="right">';
} }
if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
@ -173,12 +173,12 @@ class Form
if (!empty($notabletag) && $notabletag == 3) { if (!empty($notabletag) && $notabletag == 3) {
$ret .= ' '; $ret .= ' ';
} }
if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if (empty($notabletag) && $perm) {
$ret .= '</td>'; $ret .= '</td>';
} }
//if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) { if (empty($notabletag) && $perm) {
$ret .= '</tr></table>'; $ret .= '</tr></table>';
//} }
} }
return $ret; return $ret;