extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix alarm-offset not being sent to client

Browse Source
This commit is contained in:
Hadi Nategh 2020-04-07 18:01:55 +02:00
parent 7c14d09409
commit 2f7e082d66
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1157,9 +1157,16 @@ class calendar_boupdate extends calendar_bo
'id' => $event['id'], 'id' => $event['id'],
'app' => 'calendar', 'app' => 'calendar',
'videoconference' => $details['videoconference'], 'videoconference' => $details['videoconference'],
) + ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : [])); ));
}
if ($m_type === MSG_ALARM)
{
$notification->set_popupdata('calendar',
array('egw_pr_notify' => 1,
'type' => $m_type,
'videoconference' => $details['videoconference'])
+ ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : []));
} }
if ($m_type === MSG_ALARM) $notification->set_popupdata('calendar', array('egw_pr_notify' => 1, 'type' => $m_type, 'videoconference' => $details['videoconference']));
$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')));

2
notifications/js/notificationajaxpopup.js
View File

@ -356,7 +356,7 @@
switch (notifymessages[id]['extra_data']['egw_pr_notify']) switch (notifymessages[id]['extra_data']['egw_pr_notify'])
{ {
case EGW_PR_NOTIFY_HEIGH: case EGW_PR_NOTIFY_HEIGH:
if (notifymessages[id]['extra_data']['videoconference']) if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] == 300)
{ {
app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference']); app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference']);
} }