extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-16 03:30:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix missing owner resource icons on initial load

Browse Source
This commit is contained in:
nathan 2023-03-24 13:15:23 -06:00
parent 0de4ad22c2
commit c9c98969b4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -326,14 +326,14 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
case 'c':
case '':
// check if link-search already returned either icon or (l|f)name and only if not, query contact again
if (!(isset($value['icon']) || isset($value['lname']) && isset($value['fname'])) &&
($contact = $contacts_obj->read($type === '' ? 'account:'.$id : $id, true)))
if(!(isset($value['icon']) || isset($value['lname']) && isset($value['fname'])) &&
($contact = $contacts_obj->read($type === '' ? 'account:' . $id : $data['res_id'], true)))
{
if (Api\Contacts::hasPhoto($contact))
if(Api\Contacts::hasPhoto($contact))
{
$value['icon'] = Api\Framework::link('/api/avatar.php', array(
'contact_id' => $contact['id'],
'etag' => $contact['etag'] ? $contact['etag'] : 1
'etag' => $contact['etag'] ? $contact['etag'] : 1
));
}
else
@ -344,7 +344,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
}
if($id < 0)
{
$value['resources'] = array_map('strval',$GLOBALS['egw']->accounts->members($id, true));
$value['resources'] = array_map('strval', $GLOBALS['egw']->accounts->members($id, true));
}
break;
default :

2
calendar/inc/class.calendar_ui.inc.php
View File

@ -16,6 +16,8 @@ use EGroupware\Api\Egw;
use EGroupware\Api\Etemplate;
use EGroupware\Api\Framework;
require_once("class.calendar_owner_etemplate_widget.inc.php");
/**
* Shared base-class of all calendar UserInterface classes
*