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

* Notifications: remove calendar notification from the list after applying any of actions

Browse Source
This commit is contained in:
Hadi Nategh 2019-08-14 16:30:59 +02:00
parent 70fd9a6529
commit a3d0a6e9ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_hooks.inc.php
View File

@ -878,19 +878,19 @@ END:VALARM';
'id' => 'A', 'id' => 'A',
'caption' => lang('Accept'), 'caption' => lang('Accept'),
'icon' => 'accepted', '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( array(
'id' => 'R', 'id' => 'R',
'caption' => lang('Reject'), 'caption' => lang('Reject'),
'icon' => 'rejected', '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( array(
'id' => 'T', 'id' => 'T',
'caption' => lang('Tentative'), 'caption' => lang('Tentative'),
'icon' => '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]);'
) )
); );
} }

2
notifications/js/notificationajaxpopup.js
View File

@ -339,7 +339,7 @@
.addClass('et2_button') .addClass('et2_button')
.css({'background-image':'url('+egw.image(notifymessages[id].data.actions[action].icon,notifymessages[id].data.app)+')'}) .css({'background-image':'url('+egw.image(notifymessages[id].data.actions[action].icon,notifymessages[id].data.app)+')'})
.text(notifymessages[id].data.actions[action].caption) .text(notifymessages[id].data.actions[action].caption)
.click(jQuery.proxy(func,this)) .click(jQuery.proxy(func, this, [$message]))
.prependTo($actions_container); .prependTo($actions_container);
} }
$actions_container.appendTo($message); $actions_container.appendTo($message);