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

When adding a mailing list as participant, immediately expand it to contacts

Browse Source
This commit is contained in:
nathangray 2016-07-12 11:22:25 -06:00
parent 27872faaf6
commit 7181b4eab4
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -158,6 +158,16 @@ class calendar_uiforms extends calendar_ui
} }
elseif (is_array($this->bo->resources[$uid[0]])) elseif (is_array($this->bo->resources[$uid[0]]))
{ {
// Expand mailing lists
if($uid[0] == 'l')
{
foreach($this->bo->enum_mailing_list($uid) as $contact)
{
$participants[$contact] = $participant_types['c'][substr($contact,1)] =
calendar_so::combine_status('U',1,'REQ-PARTICIPANT');
}
continue;
}
// if contact is a user, use the user instead (as the GUI) // if contact is a user, use the user instead (as the GUI)
if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid,1),'person_id'))) if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid,1),'person_id')))
{ {
@ -423,6 +433,16 @@ class calendar_uiforms extends calendar_ui
ExecMethod($this->bo->resources[$type]['new_status'],$id) : ExecMethod($this->bo->resources[$type]['new_status'],$id) :
($uid == $this->bo->user ? 'A' : 'U'); ($uid == $this->bo->user ? 'A' : 'U');
// Expand mailing lists
if($type == 'l')
{
foreach($this->bo->enum_mailing_list($participant) as $contact)
{
$event['participants'][$contact] = $event['participant_types']['c'][substr($contact,1)] =
calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
}
continue;
}
if ($status) if ($status)
{ {
$res_info = $this->bo->resource_info($uid); $res_info = $this->bo->resource_info($uid);