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

Fix socpeople assigned list in action com list

Browse Source
This commit is contained in:
John Botella 2019-07-17 16:49:41 +02:00
parent 617d10bf2a
commit b5d348356d
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/comm/action/list.php
View File

@ -524,6 +524,7 @@ if ($resql)
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
$caction=new CActionComm($db); $caction=new CActionComm($db);
$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1); $arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
$contactListCache = array();
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
@ -634,7 +635,34 @@ if ($resql)
// Contact // Contact
if (! empty($arrayfields['a.fk_contact']['checked'])) { if (! empty($arrayfields['a.fk_contact']['checked'])) {
print '<td>'; print '<td>';
if ($obj->fk_contact > 0)
$actionstatic->fetchResources();
if(!empty($actionstatic->socpeopleassigned))
{
$contactList = array();
foreach ($actionstatic->socpeopleassigned as $socpeopleId => $socpeopleassigned)
{
if(!isset($contactListCache[$socpeopleassigned['id']]))
{
// if no cache found we fetch it
$contact = new Contact($db);
if($contact->fetch($socpeopleassigned['id'])>0)
{
$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1,'',28);
$contactList[] = $contact->getNomUrl(1,'',28);
}
}
else{
// use cache
$contactList[] = $contactListCache[$socpeopleassigned['id']];
}
}
if(!empty($contactList)){
print implode(', ', $contactList);
}
}
elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
{ {
$contactstatic->id=$obj->fk_contact; $contactstatic->id=$obj->fk_contact;
$contactstatic->email=$obj->email; $contactstatic->email=$obj->email;