Monotone-Parent: 763d7579a98e9af74a10d6369344af9e5e9a574b
Monotone-Revision: cdf13b5c1ef576b104b53f12fc364017defa9f0e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-11T20:27:13 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
1d91077457
commit
90cb4730a4
|
@ -52,8 +52,7 @@
|
|||
WORequest *request;
|
||||
|
||||
folders = [self clientObject];
|
||||
action = [NSString stringWithFormat: @"../%@/%@",
|
||||
[folders defaultSourceName],
|
||||
action = [NSString stringWithFormat: @"../personal/%@",
|
||||
actionName];
|
||||
|
||||
request = [[self context] request];
|
||||
|
@ -82,7 +81,11 @@
|
|||
|
||||
name = [self queryParameterForKey: @"name"];
|
||||
if ([name length] > 0)
|
||||
response = [[self clientObject] newFolderWithName: name];
|
||||
{
|
||||
response = [[self clientObject] newFolderWithName: name];
|
||||
if (!response)
|
||||
response = [self responseWith204];
|
||||
}
|
||||
else
|
||||
response = [NSException exceptionWithHTTPStatus: 400
|
||||
reason: @"The name is missing"];
|
||||
|
@ -111,8 +114,7 @@
|
|||
{
|
||||
uid = [currentContact objectForKey: @"c_uid"];
|
||||
if (uid && ![results objectForKey: uid])
|
||||
[results setObject: currentContact
|
||||
forKey: uid];
|
||||
[results setObject: currentContact forKey: uid];
|
||||
currentContact = [folderResults nextObject];
|
||||
}
|
||||
}
|
||||
|
@ -202,7 +204,7 @@
|
|||
gcsFolders = [NSMutableArray new];
|
||||
[gcsFolders autorelease];
|
||||
|
||||
contactSubfolders = [[contactFolders contactFolders] objectEnumerator];
|
||||
contactSubfolders = [[contactFolders subFolders] objectEnumerator];
|
||||
currentContactFolder = [contactSubfolders nextObject];
|
||||
while (currentContactFolder)
|
||||
{
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
#import <SoObjects/SOGo/SOGoUser.h>
|
||||
#import <SoObjects/Contacts/SOGoContactFolder.h>
|
||||
#import <SoObjects/Contacts/SOGoContactFolders.h>
|
||||
|
||||
#import "UIxContactsListViewContainer.h"
|
||||
|
||||
|
@ -115,7 +116,7 @@
|
|||
|
||||
folderContainer = [[self clientObject] container];
|
||||
|
||||
return [folderContainer contactFolders];
|
||||
return [folderContainer subFolders];
|
||||
}
|
||||
|
||||
- (NSString *) currentContactFolderId
|
||||
|
|
Loading…
Reference in New Issue