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

Merge pull request #24597 from frederic34/patch-6

Browse Source 
can setup max extrafields to show in tooltip
This commit is contained in:
Laurent Destailleur 2023-04-26 22:04:07 +02:00 committed by GitHub
commit d56a0fa503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/ajax/ajaxtooltip.php
View File

@ -80,6 +80,7 @@ $html = '';
if (is_object($object)) { if (is_object($object)) {
if ($object->id > 0 || !empty($object->ref)) { if ($object->id > 0 || !empty($object->ref)) {
/** @var CommonObject $object */
$html = $object->getTooltipContent($params); $html = $object->getTooltipContent($params);
} elseif ($res == 0) { } elseif ($res == 0) {
$html = $langs->trans('Deleted'); $html = $langs->trans('Deleted');

32
htdocs/core/class/commonobject.class.php
View File

@ -741,14 +741,38 @@ abstract class CommonObject
{ {
global $action, $extrafields, $langs, $hookmanager; global $action, $extrafields, $langs, $hookmanager;
$MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP = 5; // If there is too much extrafields, we do not include them into tooltip // If there is too much extrafields, we do not include them into tooltip
$MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP = getDolGlobalInt('MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP', 5);
$datas = $this->getTooltipContentArray($params); $datas = $this->getTooltipContentArray($params);
$count = 0;
// Add extrafields // Add extrafields
if (!empty($extrafields->attributes[$this->table_element]['label'])) { if (!empty($extrafields->attributes[$this->table_element]['label'])) {
if (count($extrafields->attributes[$this->table_element]['label']) < $MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP) {
foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
if ($count >= $MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP) {
$datas['more_extrafields'] = '<br>.../...';
break;
}
$enabled = 1;
if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {
$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');
}
if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
}
$perms = 1;
if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {
$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
}
if (empty($enabled)) {
continue; // 0 = Never visible field
}
if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) {
continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation
}
if (empty($perms)) {
continue; // 0 = Not visible
}
if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) { if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]); $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
} }
@ -758,7 +782,7 @@ abstract class CommonObject
} else { } else {
$value = (empty($this->array_options['options_' . $key]) ? '' : $this->array_options['options_' . $key]); $value = (empty($this->array_options['options_' . $key]) ? '' : $this->array_options['options_' . $key]);
$datas[$key]= '<br><b>'. $labelextra . ':</b> ' . $extrafields->showOutputField($key, $value, '', $this->table_element); $datas[$key]= '<br><b>'. $labelextra . ':</b> ' . $extrafields->showOutputField($key, $value, '', $this->table_element);
} $count++;
} }
} }
} }