Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur
2022-05-25 23:43:16 +02:00
parent c79de819d3
commit 343056dcbd
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/list.php
View File

@@ -1200,8 +1200,8 @@ while ($i < min($num, $limit)) {
} }
} }
if (!empty($arrayfields['d.import_key']['checked'])) { if (!empty($arrayfields['d.import_key']['checked'])) {
print '<td class="tdoverflowmax100">'; print '<td class="tdoverflowmax100 center" title="'.dol_escape_htmltag($obj->import_key).'">';
print $obj->import_key; print dol_escape_htmltag($obj->import_key);
print "</td>\n"; print "</td>\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;

20
htdocs/core/lib/functions.lib.php
View File

@@ -4958,10 +4958,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
$liste_titre = 'liste_titre_sel'; $liste_titre = 'liste_titre_sel';
} }
$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib; $tagstart = '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : ''); //$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : ''; $tagstart .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
$out .= '>'; $tagstart .= '>';
if (empty($thead) && $field && empty($disablesortlink)) { // If this is a sort field if (empty($thead) && $field && empty($disablesortlink)) { // If this is a sort field
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : '')); $options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
@@ -4975,12 +4975,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if ($field1 != $sortfield1) { // We are on another field than current sorted field if ($field1 != $sortfield1) { // We are on another field than current sorted field
if (preg_match('/^DESC/i', $sortorder)) { if (preg_match('/^DESC/i', $sortorder)) {
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field))); $sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
} else // We reverse the var $sortordertouseinlink } else { // We reverse the var $sortordertouseinlink
{
$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field))); $sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
} }
} else // We are on field that is the first current sorting criteria } else { // We are on field that is the first current sorting criteria
{
if (preg_match('/^ASC/i', $sortorder)) { // We reverse the var $sortordertouseinlink if (preg_match('/^ASC/i', $sortorder)) { // We reverse the var $sortordertouseinlink
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field))); $sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
} else { } else {
@@ -5019,19 +5017,19 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if (preg_match('/^DESC/', $sortorder)) { if (preg_match('/^DESC/', $sortorder)) {
//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>'; //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>'; //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingleft').'</span>'; $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingright').'</span>';
} }
if (preg_match('/^ASC/', $sortorder)) { if (preg_match('/^ASC/', $sortorder)) {
//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>'; //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';
//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>'; //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingleft').'</span>'; $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingright').'</span>';
} }
} }
} }
$out .= $sortimg; $tagend = '</'.$tag.'>';
$out .= '</'.$tag.'>'; $out = $tagstart.$sortimg.$out.$tagend;
return $out; return $out;
} }

3
htdocs/theme/eldy/global.inc.php
View File

@@ -149,7 +149,8 @@ select.vmenusearchselectcombo {
background-color: unset; background-color: unset;
} }
table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) { table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
max-width: 100px; max-width: 100px;

3
htdocs/theme/md/style.css.php
View File

@@ -403,7 +403,8 @@ textarea.cke_source:focus
box-shadow: none; box-shadow: none;
} }
th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) { th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
max-width: 120px; max-width: 120px;