Monotone-Parent: 6866d4abaee108a54dd6fba0c2f1d7d1c2988643

Monotone-Revision: 9af95afe2010bba949dc73bd6027dbc10d2d4cf5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-01-09T17:32:30
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-01-09 17:32:30 +00:00
parent 5173cf7921
commit 17dfe238b1
3 changed files with 24 additions and 12 deletions

View File

@@ -1,3 +1,11 @@
2009-01-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
-sendFolderAdvisoryTemplate:template]): the condition check for
sending folder advisories has been moved here.
([SOGoGCSFolder -sendFolderAdvisoryTemplate:template]): now a
public method.
2008-01-07 Ludovic Marcotte <lmarcotte@inverse.ca>
* Added Documentation/SOGo Mobile Devices Configuration.odt

View File

@@ -98,6 +98,9 @@
- (void) removeAclsForUsers: (NSArray *) users
forObjectAtPath: (NSArray *) objectPathArray;
/* advisories */
- (void) sendFolderAdvisoryTemplate: (NSString *) template;
@end
#endif /* __SOGo_SOGoGCSFolder_H__ */

View File

@@ -378,15 +378,18 @@ static NSArray *childRecordFields = nil;
SOGoUser *user;
SOGoFolderAdvisory *page;
user = [context activeUser];
pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
[user language], template];
if (sendFolderAdvisories)
{
user = [context activeUser];
pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
[user language], template];
page = [[WOApplication application] pageWithName: pageName
inContext: context];
[page setFolderObject: self];
[page setRecipientUID: [user login]];
[page send];
page = [[WOApplication application] pageWithName: pageName
inContext: context];
[page setFolderObject: self];
[page setRecipientUID: [user login]];
[page send];
}
}
- (BOOL) create
@@ -398,8 +401,7 @@ static NSArray *childRecordFields = nil;
atPath: ocsPath];
if (!result
&& [[context request] handledByDefaultHandler]
&& sendFolderAdvisories)
&& [[context request] handledByDefaultHandler])
[self sendFolderAdvisoryTemplate: @"Addition"];
return (result == nil);
@@ -418,8 +420,7 @@ static NSArray *childRecordFields = nil;
else
error = [[self folderManager] deleteFolderAtPath: ocsPath];
if (!error && sendFolderAdvisories
&& [[context request] handledByDefaultHandler])
if (!error && [[context request] handledByDefaultHandler])
[self sendFolderAdvisoryTemplate: @"Removal"];
return error;