holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also show external organiser in textual replies and remove him from participants

Browse Source
This commit is contained in:
Ralf Becker 2018-06-27 20:22:04 +02:00
parent 8e419f1c1a
commit f6a6412d25
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -79,7 +79,7 @@ class calendar_boupdate extends calendar_bo
* @var array id => data * @var array id => data
*/ */
protected static $tz_cache = array(); protected static $tz_cache = array();
/** /**
* The resources storage object * The resources storage object
* @var resources_so $resources_so * @var resources_so $resources_so
@ -94,7 +94,7 @@ class calendar_boupdate extends calendar_bo
if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True); if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
parent::__construct(); // calling the parent constructor parent::__construct(); // calling the parent constructor
$this->resources_so = new resources_so(); $this->resources_so = new resources_so();
if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True); if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
@ -1941,7 +1941,21 @@ class calendar_boupdate extends calendar_bo
if (isset($event['participants']) && is_array($event['participants']) && !empty($event['participants'])) if (isset($event['participants']) && is_array($event['participants']) && !empty($event['participants']))
{ {
$participants = $this->participants($event,true); $participants = $this->participants($event,true);
// fix external organiser to not be included as participant and shown as organiser
foreach($event['participants'] as $uid => $status)
{
$role = $quantity = null;
calendar_so::split_status($status, $quantity, $role);
if ($role == 'CHAIR' && $status == 'D' && !is_numeric($uid))
{
$var['owner']['data'] = $this->participant_name($uid);
unset($participants[$uid]);
break;
}
}
} }
$var['participants'] = Array( $var['participants'] = Array(
'field' => lang('Participants'), 'field' => lang('Participants'),
'data' => $participants 'data' => $participants