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

Fix label of field in error message

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-23 02:31:38 +02:00
parent b5d3f0df06
commit 2eb6ed39ba
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/customreports.php
View File

@ -363,17 +363,35 @@ if (is_array($search_groupby) && count($search_groupby)) {
// Add a protection/error to refuse the request if number of differentr values for the group by is higher than $MAXUNIQUEVALFORGROUP // Add a protection/error to refuse the request if number of differentr values for the group by is higher than $MAXUNIQUEVALFORGROUP
if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) { if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
$langs->load("errors"); $langs->load("errors");
if (strpos($fieldtocount, 'te.') === 0) { if (strpos($fieldtocount, 'te.') === 0) { // This is an extrafield
//if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) { //if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) {
// $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]); // $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]);
//} //}
$keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix]; $keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix];
} else { $labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label']; } elseif (strpos($fieldtocount, 't__') === 0) { // This is a field of a foreign key
$reg = array();
if (preg_match('/^(.*)\.(.*)/', $gvalwithoutprefix, $reg)) {
$gvalwithoutprefix = preg_replace('/\..*$/', '', $gvalwithoutprefix);
$gvalwithoutprefix = preg_replace('/t__/', '', $gvalwithoutprefix);
$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield).'-'.$reg[2];
} else {
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
}
} else { // This is a common field
$reg = array();
if (preg_match('/^(.*)\-(year|month|day)/', $gvalwithoutprefix, $reg)) {
$gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix);
$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield).'-'.$reg[2];
} else {
$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
}
} }
//var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix); //var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix.' '.$fieldtocount.' '.$keyforlabeloffield);
$gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix); //var_dump($object->fields);
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
setEventMessages($langs->trans("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings'); setEventMessages($langs->trans("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
$search_groupby = array(); $search_groupby = array();
} }