From 85cfae601f91346d52bf01506d1e07caab8e7002 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 4 Jun 2010 21:14:17 +0000 Subject: [PATCH] Monotone-Parent: 75884864019e8268f2d2a24b534d0020370d2de5 Monotone-Revision: 73c003158a06a65893a6deafa03df694aa0178b6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-04T21:14:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Common/UIxUserRightsEditor.m | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23897185f..81771be84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-06-04 Wolfgang Sourdeau + * UI/Common/UIxUserRightsEditor.m + (-sendACLAdvisoryTemplateForObject:): don't attempt to send a notification + email to the "anonymous" or the default user. + * SoObjects/Appointments/SOGoAppointmentFolderXML.[hm]: same as below for XML. diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m index 8b71e5329..ad809cff4 100644 --- a/UI/Common/UIxUserRightsEditor.m +++ b/UI/Common/UIxUserRightsEditor.m @@ -149,16 +149,19 @@ SOGoACLAdvisory *page; WOApplication *app; - ud = [[SOGoUser userWithLogin: uid roles: nil] userDefaults]; - language = [ud language]; - pageName = [NSString stringWithFormat: @"SOGoACL%@ModificationAdvisory", - language]; + if (!([self userIsDefaultUser] || [self userIsAnonymousUser])) + { + ud = [[SOGoUser userWithLogin: uid roles: nil] userDefaults]; + language = [ud language]; + pageName = [NSString stringWithFormat: @"SOGoACL%@ModificationAdvisory", + language]; - app = [WOApplication application]; - page = [app pageWithName: pageName inContext: context]; - [page setACLObject: theObject]; - [page setRecipientUID: uid]; - [page send]; + app = [WOApplication application]; + page = [app pageWithName: pageName inContext: context]; + [page setACLObject: theObject]; + [page setRecipientUID: uid]; + [page send]; + } } - (id ) saveUserRightsAction