extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Notifications: if deleting all (visible) messages, directly return the next junk, to ease cleaning them up

Browse Source
This commit is contained in:
ralf 2024-04-11 16:39:31 +02:00
parent 5c6313448e
commit ef67e21930
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
notifications/js/notificationajaxpopup.js
View File

@ -570,9 +570,11 @@
notifications.prototype.delete_all = function () { notifications.prototype.delete_all = function () {
if (!notifymessages || Object.entries(notifymessages).length == 0) return false; if (!notifymessages || Object.entries(notifymessages).length == 0) return false;
egw.request("notifications.notifications_ajax.delete_message", [notifymessages.map(d => d.id)]); egw.request("notifications.notifications_ajax.delete_message", [Object.keys(notifymessages)]);
notifymessages = {}; notifymessages = {};
_currentRawData = []; // otherwise response from delete_message/get_notifications might not get parsed
this.total = 0; this.total = 0;
this.counterUpdate();
jQuery("#egwpopup_list").empty(); jQuery("#egwpopup_list").empty();
egw.loading_prompt('popup_notifications', false); egw.loading_prompt('popup_notifications', false);
this.bell("inactive"); this.bell("inactive");
@ -590,6 +592,7 @@
var keepLoadingPrompt = false; var keepLoadingPrompt = false;
delete (notifymessages[id]); delete (notifymessages[id]);
this.total -= 1; this.total -= 1;
this.counterUpdate();
if (nextNode.length > 0 && nextNode[0].id.match(/egwpopup_message_/ig) && egwpopup_message.hasClass('egwpopup_expanded')) if (nextNode.length > 0 && nextNode[0].id.match(/egwpopup_message_/ig) && egwpopup_message.hasClass('egwpopup_expanded'))
{ {
nextNode.trigger('click'); nextNode.trigger('click');