mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 08:53:37 +01:00
fix folder badge was not updated when rightclick 'mark all as read' was clicked Ticket #97521
fix folder badge was not updated when rightclick 'mark all as read' was clicked Ticket #97521
This commit is contained in:
parent
239689036a
commit
247c51edab
@ -5127,10 +5127,18 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
|
|||||||
$this->changeProfile($uidA['profileID']);
|
$this->changeProfile($uidA['profileID']);
|
||||||
}
|
}
|
||||||
$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
|
$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
|
||||||
|
//_messageList['msg'][0] was in form of {accountID}::{folderName}
|
||||||
|
// so we need to correct $folder and $profileID
|
||||||
if(!$folder && !$uidA['msg'] && $uidA['accountID'])
|
if(!$folder && !$uidA['msg'] && $uidA['accountID'])
|
||||||
{
|
{
|
||||||
$folder = $uidA['accountID'];
|
$folder = $uidA['accountID'];
|
||||||
}
|
}
|
||||||
|
$profileID = $uidA['profileID'];
|
||||||
|
if(!$profileID && !$uidA['msg'] && $uidA['app'])
|
||||||
|
{
|
||||||
|
$profileID=$uidA['app'];
|
||||||
|
}
|
||||||
|
//end correction
|
||||||
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
|
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters'])
|
||||||
{
|
{
|
||||||
$query = $_messageList['activeFilters'];
|
$query = $_messageList['activeFilters'];
|
||||||
@ -5301,7 +5309,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
|
|||||||
}
|
}
|
||||||
else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
|
else if ((isset($_messageList['all']) && $_messageList['all']) || ($query['filter'] && ($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false)))
|
||||||
{
|
{
|
||||||
self::ajax_setFolderStatus($_messageList['msg'],true);
|
self::ajax_setFolderStatus([$profileID."::".$folder],true);
|
||||||
$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),lang($folder)),'mail');
|
$response->call('egw.refresh',lang('flagged %1 messages as %2 in %3',(isset($_messageList['all']) && $_messageList['all']?lang('all'):count($_messageList['msg'])),lang(($flag[$_flag]?$flag[$_flag]:$_flag)),lang($folder)),'mail');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user