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 wrong user set as owner of event in video conference alarm dialog

Browse Source
This commit is contained in:
Hadi Nategh 2020-04-08 15:14:39 +02:00
parent bdd0eef739
commit 23bd20b2cc
2 changed files with 9 additions and 4 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

@ -1165,8 +1165,8 @@ class calendar_boupdate extends calendar_bo
array('egw_pr_notify' => 1, array('egw_pr_notify' => 1,
'type' => $m_type, 'type' => $m_type,
'videoconference' => $details['videoconference'], 'videoconference' => $details['videoconference'],
'account_id' => $userid, 'account_id' => $senderid,
'name' => $fullname 'name' => Api\Accounts::username($senderid)
) )
+ ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : [])); + ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : []));
} }

9
notifications/js/notificationajaxpopup.js
View File

@ -358,8 +358,13 @@
case EGW_PR_NOTIFY_HEIGH: case EGW_PR_NOTIFY_HEIGH:
if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300) if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300)
{ {
app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference'], app.status.scheduled_receivedCall({
notifymessages[id]['extra_data']['account_id'], notifymessages[id]['extra_data']['name']); url: notifymessages[id]['extra_data']['videoconference'],
account_id: notifymessages[id]['extra_data']['account_id'],
avatar: 'account:'+ notifymessages[id]['extra_data']['account_id'],
title: notifymessages[id]['data']['title'],
owner: notifymessages[id]['extra_data']['name']
});
} }
else { else {
this.toggle(true); this.toggle(true);