From a3d0a6e9abac30a986b35c0bbb7a0e6cf17b14f8 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 14 Aug 2019 16:30:59 +0200 Subject: [PATCH] * Notifications: remove calendar notification from the list after applying any of actions --- calendar/inc/class.calendar_hooks.inc.php | 6 +++--- notifications/js/notificationajaxpopup.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 8145a64b2a..9c84924a55 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -878,19 +878,19 @@ END:VALARM'; 'id' => 'A', 'caption' => lang('Accept'), 'icon' => 'accepted', - 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"A"'.']).sendRequest(true);' + 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"A"'.']).sendRequest(true);this.button_delete(arguments[0], arguments[1]);' ), array( 'id' => 'R', 'caption' => lang('Reject'), 'icon' => 'rejected', - 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"R"'.']).sendRequest(true);' + 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"R"'.']).sendRequest(true);this.button_delete(arguments[0], arguments[1]);' ), array( 'id' => 'T', 'caption' => lang('Tentative'), 'icon' => 'tentative', - 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"T"'.']).sendRequest(true);' + 'onExecute' => 'egw().json("calendar.calendar_uiforms.ajax_status",['.$params['data']['event_id'].','.$params['data']['user_id'].','.'"T"'.']).sendRequest(true);this.button_delete(arguments[0], arguments[1]);' ) ); } diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js index 4b8993c4ab..5ed47a106c 100644 --- a/notifications/js/notificationajaxpopup.js +++ b/notifications/js/notificationajaxpopup.js @@ -339,7 +339,7 @@ .addClass('et2_button') .css({'background-image':'url('+egw.image(notifymessages[id].data.actions[action].icon,notifymessages[id].data.app)+')'}) .text(notifymessages[id].data.actions[action].caption) - .click(jQuery.proxy(func,this)) + .click(jQuery.proxy(func, this, [$message])) .prependTo($actions_container); } $actions_container.appendTo($message);