From 9065a8038a4ebe114e7b97199601132f3016a1a0 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 5 Jan 2015 22:29:00 -0500 Subject: [PATCH] JSONify [UIxMailActions replyToAll:] --- UI/MailerUI/UIxMailActions.m | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/UI/MailerUI/UIxMailActions.m b/UI/MailerUI/UIxMailActions.m index 73472445a..46ee745db 100644 --- a/UI/MailerUI/UIxMailActions.m +++ b/UI/MailerUI/UIxMailActions.m @@ -48,20 +48,28 @@ { SOGoMailAccount *account; SOGoMailObject *co; - SOGoDraftsFolder *folder; + SOGoDraftsFolder *drafts; SOGoDraftObject *newMail; - NSString *newLocation; + NSString *accountName, *mailboxName, *messageName; + NSDictionary *data; co = [self clientObject]; account = [co mailAccountFolder]; - folder = [account draftsFolderInContext: context]; - newMail = [folder newDraft]; + drafts = [account draftsFolderInContext: context]; + newMail = [drafts newDraft]; [newMail fetchMailForReplying: co toAll: toAll]; - newLocation = [NSString stringWithFormat: @"%@/edit", - [newMail baseURLInContext: context]]; + accountName = [account nameInContainer]; + mailboxName = [drafts relativeImap4Name]; + messageName = [newMail nameInContainer]; - return [self redirectToLocation: newLocation]; + data = [NSDictionary dictionaryWithObjectsAndKeys: + accountName, @"accountId", + mailboxName, @"mailboxPath", + messageName, @"draftId", nil]; + + return [self responseWithStatus: 201 + andString: [data jsonRepresentation]]; } - (WOResponse *) replyAction