From 4c02b926299eb98487804726ff97bbc379e26a88 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 22 Apr 2010 18:11:31 +0000 Subject: [PATCH] Monotone-Parent: fdc69a8bf5b6b5a68b37d7ddf77d671fc0bcbe15 Monotone-Revision: ef460d9a1b70d8d0e6195ea18cc95d9a2b9abbbf Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-22T18:11:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoGCSFolder.m | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7b8ed1afb..195bbe157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-22 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoGCSFolder.m (-renameTo:): when the active + user is a super user, we modify the real owner's version of the + displayname. + * Tests/Integration/webdavlib.py (_WD_XMLTreeElement.appendSubtree): added handling of unicode subtrees diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 9e39d99b4..c51901a96 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -535,11 +535,16 @@ static NSArray *childRecordFields = nil; - (void) renameTo: (NSString *) newName { + SOGoUser *activeUser; + #warning SOGoFolder should have the corresponding method [displayName release]; displayName = nil; - if (activeUserIsOwner) + activeUser = [context activeUser]; + if (activeUserIsOwner + || ([activeUser respondsToSelector: @selector (isSuperUser)] + && [activeUser isSuperUser])) [self _ownerRenameTo: newName]; else [self _subscriberRenameTo: newName];