LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 08ff4ed5c2f1ac739d34cf7fe2a75f3b3ac2d7dd 

Monotone-Revision: 05e312bc2aff1f30bb0ce98944cb16c89ee15b86

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-27T14:20:09
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-10-27 14:20:09 +00:00
parent 9be74a5980
commit 856ec615f4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Contacts/SOGoContactFolders.m
View File

@ -46,7 +46,7 @@
#import "SOGoContactSourceFolder.h" #import "SOGoContactSourceFolder.h"
#import "SOGoContactFolders.h" #import "SOGoContactFolders.h"
#define XMLNS_INVERSEDAV @"urn:ietf:params:xml:ns:inverse-dav" #define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav"
@implementation SOGoContactFolders @implementation SOGoContactFolders
+ (NSString *) gcsFolderType + (NSString *) gcsFolderType

2
SoObjects/SOGo/SOGoUserFolder.m
View File

@ -374,7 +374,7 @@
r = [context response]; r = [context response];
[r prepareDAVResponse]; [r prepareDAVResponse];
[r appendContentString: @"<D:multistatus xmlns:D=\"DAV:\"" [r appendContentString: @"<D:multistatus xmlns:D=\"DAV:\""
@" xmlns=\"urn:ietf:params:xml:ns:inverse-dav\">"]; @" xmlns=\"urn:inverse:params:xml:ns:inverse-dav\">"];
document = [[context request] contentAsDOMDocument]; document = [[context request] contentAsDOMDocument];
filter = [self _parseCollectionFilters: document]; filter = [self _parseCollectionFilters: document];

10
Tests/Integration/test-contact-categories.py
View File

@ -11,9 +11,9 @@ class HTTPContactCategoriesTest(unittest.TestCase):
resource = '/SOGo/dav/%s/Contacts/' % user resource = '/SOGo/dav/%s/Contacts/' % user
if categories is None: if categories is None:
categories = [] categories = []
elements = [ { "{urn:ietf:params:xml:ns:inverse-dav}category": x } elements = [ { "{urn:inverse:params:xml:ns:inverse-dav}category": x }
for x in categories ] for x in categories ]
props = { "{urn:ietf:params:xml:ns:inverse-dav}contacts-categories": elements } props = { "{urn:inverse:params:xml:ns:inverse-dav}contacts-categories": elements }
proppatch = webdavlib.WebDAVPROPPATCH(resource, props) proppatch = webdavlib.WebDAVPROPPATCH(resource, props)
client = webdavlib.WebDAVClient(hostname, port, username, password) client = webdavlib.WebDAVClient(hostname, port, username, password)
client.execute(proppatch) client.execute(proppatch)
@ -24,7 +24,7 @@ class HTTPContactCategoriesTest(unittest.TestCase):
def _getCategories(self, user): def _getCategories(self, user):
resource = '/SOGo/dav/%s/Contacts/' % user resource = '/SOGo/dav/%s/Contacts/' % user
props = [ "{urn:ietf:params:xml:ns:inverse-dav}contacts-categories" ] props = [ "{urn:inverse:params:xml:ns:inverse-dav}contacts-categories" ]
propfind = webdavlib.WebDAVPROPFIND(resource, props, "0") propfind = webdavlib.WebDAVPROPFIND(resource, props, "0")
client = webdavlib.WebDAVClient(hostname, port, username, password) client = webdavlib.WebDAVClient(hostname, port, username, password)
client.execute(propfind) client.execute(propfind)
@ -33,9 +33,9 @@ class HTTPContactCategoriesTest(unittest.TestCase):
% (propfind.response["status"], user)) % (propfind.response["status"], user))
categories = [] categories = []
prop_nodes = propfind.response["document"].findall("{DAV:}response/{DAV:}propstat/{DAV:}prop/{urn:ietf:params:xml:ns:inverse-dav}contacts-categories") prop_nodes = propfind.response["document"].findall("{DAV:}response/{DAV:}propstat/{DAV:}prop/{urn:inverse:params:xml:ns:inverse-dav}contacts-categories")
for prop_node in prop_nodes: for prop_node in prop_nodes:
cat_nodes = prop_node.findall("{urn:ietf:params:xml:ns:inverse-dav}category") cat_nodes = prop_node.findall("{urn:inverse:params:xml:ns:inverse-dav}category")
if cat_nodes is not None: if cat_nodes is not None:
for cat_node in cat_nodes: for cat_node in cat_nodes:
categories.append(cat_node.text) categories.append(cat_node.text)