Handle ExpandedFolders settings from v2

2015-11-11 16:01:37 -05:00 · 2015-11-11 16:01:37 -05:00 · 87fc7b39cc
parent c7ef7a1d2f
commit 87fc7b39cc
1 changed files with 8 additions and 3 deletions
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@ -328,12 +328,17 @@

 - (WOResponse *) getFoldersStateAction
 {
-  NSString *expandedFolders;
+  id o;
+  NSArray *expandedFolders;

  [self _setupContext];
-  expandedFolders = [moduleSettings objectForKey: @"ExpandedFolders"];
+  o = [moduleSettings objectForKey: @"ExpandedFolders"];
+  if ([o isKindOfClass: [NSString class]])
+    expandedFolders = [o componentsSeparatedByString: @","];
+  else
+    expandedFolders = o;

-  return [self responseWithStatus: 200 andString: expandedFolders];
+  return [self responseWithStatus: 200 andJSONRepresentation: expandedFolders];
 }

 - (NSString *) verticalDragHandleStyle