amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-01 19:42:48 +00:00
Code Issues Projects Releases Wiki Activity

bugfix with threads collapsing for a nested folder

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-09-15 10:31:51 -04:00
parent 4b9db66f8b
commit 6ec79f7792
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
UI/MailerUI/UIxMailActions.m
View File

@@ -149,20 +149,22 @@
- (void) collapseAction: (BOOL) isCollapsing
{
SOGoMailObject *co;
NSMutableDictionary *moduleSettings, *threadsCollapsed;
WORequest *request;
NSMutableDictionary *moduleSettings, *threadsCollapsed, *content;
NSMutableArray *mailboxThreadsCollapsed;
NSString *msguid, *currentMailbox, *currentAccount, *keyForMsgUIDs;
NSString *msguid, *keyForMsgUIDs;
SOGoUserSettings *us;
request = [context request];
content = [[request contentAsString] objectFromJSONString];
keyForMsgUIDs = [content objectForKey:@"currentMailbox"];
msguid = [content objectForKey:@"msguid"];
co = [self clientObject];
us = [[context activeUser] userSettings];
if (!(moduleSettings = [us objectForKey: @"Mail"]))
[us setObject:[NSMutableDictionary dictionnary] forKey: @"Mail"];
msguid = [co nameInContainer];
currentMailbox = [[co container] nameInContainer];
currentAccount = [[[co container] container] nameInContainer];
keyForMsgUIDs = [NSString stringWithFormat:@"/%@/%@", currentAccount, currentMailbox];
if (isCollapsing)
{
// Check if the module threadsCollapsed is created in the userSettings

3
UI/WebServerResources/MailerUI.js
View File

@@ -253,8 +253,9 @@ function mailListToggleMessageThread(row, cell) {
var mailbox = Mailer.currentMailbox;
var url = ApplicationBaseURL + encodeURI(mailbox) + "/" + msguid + "/" + action;
var callbackData = { "currentMailbox": Mailer.currentMailbox, "msguid": msguid, "action": action};
var content = {"currentMailbox": Mailer.currentMailbox, "msguid": msguid};
triggerAjaxRequest(url, mailListToggleMessageCollapseCallback, callbackData);
triggerAjaxRequest(url, mailListToggleMessageCollapseCallback, callbackData, Object.toJSON(content));
}
function mailListToggleMessageCollapseCallback(http) {