extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: Fix edit account does not refresh folder tree

Browse Source
This commit is contained in:
Hadi Nategh 2017-04-12 18:00:19 +02:00
parent 0e70958f95
commit 45d2e21883
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4375,7 +4375,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
Api\Translation::add_app('mail'); Api\Translation::add_app('mail');
$refreshData = array( $refreshData = array(
$icServerID => $mail_ui->mail_tree->getTree(null,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane']) $icServerID => $mail_ui->mail_tree->getTree($icServerID,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
); );
$response->call('app.mail.mail_reloadNode',$refreshData); $response->call('app.mail.mail_reloadNode',$refreshData);
} }

9
mail/js/app.js
View File

@ -1668,12 +1668,9 @@ app.classes.mail = AppJS.extend(
// if olddesc is undefined or #skip# then skip the message, as we process subfolders // if olddesc is undefined or #skip# then skip the message, as we process subfolders
if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#') if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#')
{ {
if (typeof _status[i].parent !== 'undefined') this.egw.message(this.egw.lang((typeof _status[i].parent !== 'undefined'? "Reloaded Folder %1" : "Reloaded Account %1") ,
{ (typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') :
this.egw.message(this.egw.lang("Reloaded Folder %1",typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') : _status[i].text.replace(this._unseen_regexp, ''))); (_status[i].text ? _status[i].text.replace(this._unseen_regexp, '') : _status[i].id))));
} else {
this.egw.message(this.egw.lang("Reloaded Account %1",typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') : _status[i].text.replace(this._unseen_regexp, '')));
}
} }
ftree.refreshItem(i,typeof _status[i] == "object" ? _status[i] : null); ftree.refreshItem(i,typeof _status[i] == "object" ? _status[i] : null);
if (typeof _status[i] == "string") ftree.setStyle(i, 'font-weight: '+(_status[i].match(this._unseen_regexp) ? 'bold' : 'normal')); if (typeof _status[i] == "string") ftree.setStyle(i, 'font-weight: '+(_status[i].match(this._unseen_regexp) ? 'bold' : 'normal'));