extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

also set id for calendar alarms, so notifications can group them with the event

Browse Source
This commit is contained in:
ralf 2024-04-17 09:17:28 +02:00
parent 4b683b38ea
commit 6f39a1144f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1246,7 +1246,7 @@ class calendar_boupdate extends calendar_bo
'id' => $event['id'], 'id' => $event['id'],
'app' => 'calendar', 'app' => 'calendar',
'videoconference' => $details['videoconference'], 'videoconference' => $details['videoconference'],
)); ), $event['id']);
} }
if ($m_type === MSG_ALARM) if ($m_type === MSG_ALARM)
{ {
@ -1257,7 +1257,7 @@ class calendar_boupdate extends calendar_bo
'account_id' => $senderid, 'account_id' => $senderid,
'name' => Api\Accounts::username($senderid) 'name' => Api\Accounts::username($senderid)
) )
+ ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : [])); + ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : []), $event['id']);
} }
$notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n"); $notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n");
$notification->set_popuplinks(array($details['link_arr']+array('app'=>'calendar'))); $notification->set_popuplinks(array($details['link_arr']+array('app'=>'calendar')));