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

Debug resource module

Browse Source
This commit is contained in:
Laurent Destailleur 2016-05-17 10:51:13 +02:00
parent 3b99fb01ee
commit 668df6cb7d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/resource/class/html.formresource.class.php
View File

@ -89,15 +89,15 @@ class FormResource
if ($resourcestat) if ($resourcestat)
{ {
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo) if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && ! $forcecombo)
{ {
//$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2); //$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
$out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT); $out.= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
} }
// Construct $out and $outarray // Construct $out and $outarray
$out.= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">'."\n"; $out.= '<select id="'.$htmlname.'" class="flat minwidth200" name="'.$htmlname.'">'."\n";
if ($showempty) $out.= '<option value="-1"></option>'."\n"; if ($showempty) $out.= '<option value="-1">&nbsp;</option>'."\n";
$num = count($resourcestat->lines); $num = count($resourcestat->lines);
//var_dump($resourcestat->lines); //var_dump($resourcestat->lines);
@ -106,8 +106,10 @@ class FormResource
{ {
while ( $i < $num) while ( $i < $num)
{ {
$label=$langs->trans(ucfirst($resourcestat->lines[$i]->element)).' : '; $resourceclass=ucfirst($resourcestat->lines[$i]->element);
$label.=$resourcestat->lines[$i]->ref?$resourcestat->lines[$i]->ref:''.$resourcestat->lines[$i]->label;
$label=$resourcestat->lines[$i]->ref?$resourcestat->lines[$i]->ref:''.$resourcestat->lines[$i]->label;
if ($resourceclass != 'Dolresource') $label.=' ('.$langs->trans($resourceclass).')';
if ($selected > 0 && $selected == $resourcestat->lines[$i]->id) if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
{ {