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

Merge branch 'extra-listlabel' of github.com:jfefe/dolibarr into extra-listlabel

Browse Source 
Conflicts:
	htdocs/core/class/extrafields.class.php
This commit is contained in:
jfefe 2013-07-27 01:29:05 +02:00
commit 90e245ca5a
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -707,6 +707,12 @@ class ExtraFields
$keyList .= implode(', ', $fields_label); $keyList .= implode(', ', $fields_label);
} }
$fields_label = explode('|',$InfoFieldList[1]);
if(is_array($fields_label)) {
$keyList .=', ';
$keyList .= implode(', ', $fields_label);
}
$sql = 'SELECT '.$keyList; $sql = 'SELECT '.$keyList;
$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0]; $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
//$sql.= ' WHERE entity = '.$conf->entity; //$sql.= ' WHERE entity = '.$conf->entity;
@ -726,10 +732,22 @@ class ExtraFields
$labeltoshow=''; $labeltoshow='';
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
// Several field into label (eq table:code|libelle:rowid) // Several field into label (eq table:code|libelle:rowid)
$fields_label = explode('|',$InfoFieldList[1]); $fields_label = explode('|',$InfoFieldList[1]);
if(is_array($fields_label)) if(is_array($fields_label))
{
foreach ($fields_label as $field_toshow)
{
$labeltoshow.= $obj->$field_toshow.' ';
}
}
else
{
$labeltoshow=$obj->$InfoFieldList[1];
}
$labeltoshow=dol_trunc($labeltoshow,45);
if ($value==$obj->rowid)
{ {
foreach ($fields_label as $field_toshow) foreach ($fields_label as $field_toshow)
{ {
@ -748,23 +766,24 @@ class ExtraFields
$labeltoshow=dol_trunc($translabel,18); $labeltoshow=dol_trunc($translabel,18);
}else { }else {
$labeltoshow=dol_trunc($obj->$InfoFieldList[1],18); $labeltoshow=dol_trunc($obj->$InfoFieldList[1],18);
}
if ($value==$obj->rowid)
{
$out.='<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
}
if(!empty($InfoFieldList[3])) {
$parent = $parentName.':'.$obj->{$parentField};
}
$out.='<option value="'.$obj->rowid.'"';
$out.= ($value==$obj->rowid?' selected="selected"':'');
$out.= (!empty($parent)?' parent="'.$parent.'"':'');
$out.='>'.$labeltoshow.'</option>';
$i++;
} }
if ($value==$obj->rowid)
{
$out.='<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
}
if(!empty($InfoFieldList[3])) {
$parent = $parentName.':'.$obj->{$parentField};
}
$out.='<option value="'.$obj->rowid.'"';
$out.= ($value==$obj->rowid?' selected="selected"':'');
$out.= (!empty($parent)?' parent="'.$parent.'"':'');
$out.='>'.$labeltoshow.'</option>';
$i++;
} }
} }
$this->db->free(); $this->db->free();
@ -1061,5 +1080,4 @@ class ExtraFields
return 0; return 0;
} }
} }
} }
?>