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

* Calendar: Fix notifications show actions for alarm notify messages

Browse Source
This commit is contained in:
Hadi Nategh 2018-06-27 16:25:10 +02:00
parent 9148b4665d
commit b64d96f3de
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1095,10 +1095,11 @@ class calendar_boupdate extends calendar_bo
// Add ACCEPT|REHECT|TENTATIVE actions // Add ACCEPT|REHECT|TENTATIVE actions
$notification->set_popupdata('calendar', array( $notification->set_popupdata('calendar', array(
'event_id' => $event['id'], 'event_id' => $event['id'],
'user_id' => $userid 'user_id' => $userid,
'type' => $m_type
)); ));
} }
if ($m_type === MSG_ALARM) $notification->set_popupdata('calendar', array('egw_pr_notify' => 1)); if ($m_type === MSG_ALARM) $notification->set_popupdata('calendar', array('egw_pr_notify' => 1, 'type' => $m_type));
$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
calendar/inc/class.calendar_hooks.inc.php
View File

@ -895,6 +895,8 @@ END:VALARM';
public static function notifications_actions ($params) public static function notifications_actions ($params)
{ {
Api\Translation::add_app('calendar'); Api\Translation::add_app('calendar');
// do not set actions for alarm type
if ($params['data']['type'] == 6) return array();
return array( return array(
array( array(
'id' => 'A', 'id' => 'A',

2
notifications/inc/class.notifications_ajax.inc.php
View File

@ -186,7 +186,7 @@ class notifications_ajax {
foreach ($rs as $notification) { foreach ($rs as $notification) {
$actions = null; $actions = null;
$data = json_decode($notification['notify_data'], true); $data = json_decode($notification['notify_data'], true);
if ($data['appname']) if ($data['appname'] && $data['data'])
{ {
$_actions = Api\Hooks::process (array( $_actions = Api\Hooks::process (array(
'location' => 'notifications_actions', 'location' => 'notifications_actions',