extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where badge disappears on push

Browse Source
This commit is contained in:
milan 2024-03-15 10:54:40 +01:00
parent a61dfb8d0c
commit 7c027ad41f
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/inc/class.mail_ui.inc.php
View File

@ -4120,16 +4120,12 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if (Mail::$debug) error_log(__METHOD__,' ()'.$e->getMessage ()); if (Mail::$debug) error_log(__METHOD__,' ()'.$e->getMessage ());
continue; continue;
} }
if (in_array($fS['shortDisplayName'],Mail::$autoFolders)) $fS['shortDisplayName']=lang($fS['shortDisplayName']);
//error_log(__METHOD__.__LINE__.array2string($fS)); //error_log(__METHOD__.__LINE__.array2string($fS));
if ($fS['unseen']) if ($fS['unseen'])
{ {
$oA[$_folderName] = ['displayName' => $fS['shortDisplayName'], 'unseenCount' => $fS['unseen']]; $oA[$_folderName] = ''.$fS['unseen'];
}
if ($fS['unseen']==0 && $fS['shortDisplayName'])
{
$oA[$_folderName] = ['displayName' => $fS['shortDisplayName']];
} }
} }
} }
} }

10
mail/js/app.js
View File

@ -508,9 +508,7 @@ app.classes.mail = AppJS.extend(
if (foldertree && pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined') if (foldertree && pushData.acl.folder && typeof pushData.acl.unseen !== 'undefined')
{ {
let folder_id = {}; let folder_id = {};
folder_id[folder] = (foldertree.getLabel(folder) || pushData.acl.folder) folder_id[folder] = pushData.acl.unseen;
.replace(this._unseen_regexp, '')+
(pushData.acl.unseen ? " ("+pushData.acl.unseen+")" : '');
this.mail_setFolderStatus(folder_id); this.mail_setFolderStatus(folder_id);
} }
@ -1947,13 +1945,13 @@ app.classes.mail = AppJS.extend(
for (const folderId in _status) { for (const folderId in _status) {
//ftree.setLabel(folderId,_status[folderId]["displayName"]); //ftree.setLabel(folderId,_status[folderId]["displayName"]);
// display folder-name bold for unseen mails // display folder-name bold for unseen mails
if(_status[folderId]["unseenCount"]) if(_status[folderId])
{ {
ftree.setStyle(folderId, 'font-weight: bold !important'); ftree.setStyle(folderId, 'font-weight: bold !important');
}else if(!_status[folderId]["unseenCount"] || _status[folderId]["unseenCount"] ===0 || _status[folderId]["unseenCount"] ==="0") { }else if(!_status[folderId] || _status[folderId] ===0 || _status[folderId] ==="0") {
ftree.setStyle(folderId, 'font-weight: normal'); ftree.setStyle(folderId, 'font-weight: normal');
} }
ftree.set_badge(folderId,_status[folderId]["unseenCount"]); ftree.set_badge(folderId,_status[folderId]);
//alert(i +'->'+_status[i]); //alert(i +'->'+_status[i]);
} }
}, },