Monotone-Parent: c3ae9437f2d6f5684527ea0486ab6204b9ce62b2
Monotone-Revision: 39ce1fba9746592044921a256d39e922dc2153d8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-11T19:31:06 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
7b1c213051
commit
d1e4cd97e6
|
@ -1,3 +1,10 @@
|
|||
2011-03-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Contacts/SOGoContactFolders.m
|
||||
(-setDavContactsCategories:): we need to handle the case where the
|
||||
"category" element has more than one subnode, in particular when
|
||||
xml entities are used.
|
||||
|
||||
2011-03-11 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/ContactsUI.js (initContacts): don't define
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
{
|
||||
SOGoUser *ownerUser;
|
||||
NSMutableArray *categories;
|
||||
DOMElement *documentElement, *catNode, *textNode;
|
||||
DOMElement *documentElement, *catNode;
|
||||
id <DOMDocument> document;
|
||||
id <DOMNodeList> catNodes;
|
||||
NSUInteger count, max;
|
||||
|
@ -133,14 +133,11 @@
|
|||
{
|
||||
catNode = [catNodes objectAtIndex: count];
|
||||
if ([catNode hasChildNodes])
|
||||
{
|
||||
textNode = [[catNode childNodes] objectAtIndex: 0];
|
||||
[categories addObject: [textNode nodeValue]];
|
||||
}
|
||||
[categories addObject: [catNode textValue]];
|
||||
}
|
||||
}
|
||||
|
||||
NSLog (@"setting categories to : %@", categories);
|
||||
// NSLog (@"setting categories to : %@", categories);
|
||||
ownerUser = [SOGoUser userWithLogin: owner];
|
||||
ud = [ownerUser userDefaults];
|
||||
[ud setContactsCategories: categories];
|
||||
|
|
Loading…
Reference in New Issue