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

See ChangeLog 

Monotone-Parent: 24aa8e2c1d2f2c9fdab5c5ebabfa870aac732d46
Monotone-Revision: 0cec38c2db19c72bdff0ec74c3b4141bdc6cfeb4

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-12-09T00:08:55
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2008-12-09 00:08:55 +00:00
parent 5d4d5483ef
commit cfb24466be
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-12-08 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder bareFetchFields:...]): we now
correctly handle the privacy SQL string w/o loosing
the previously defined filters.
2008-12-05 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m

5
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@ -457,7 +457,7 @@ static Class sogoAppointmentFolderKlass = Nil;
activeUser = [context activeUser];
if ([[self ownerInContext: context] isEqualToString: [[context activeUser] login]]
if ([[self ownerInContext: context] isEqualToString: [activeUser login]]
|| [[activeUser rolesForObject: self inContext: context]
containsObject: SoRole_Owner])
privacySqlString = @"";
@ -513,7 +513,8 @@ static Class sogoAppointmentFolderKlass = Nil;
privacySqlString = [self _privacySqlString];
if ([privacySqlString length])
filterSqlString = [NSString stringWithFormat: @"AND (%@)", privacySqlString];
filterSqlString = [NSString stringWithFormat: @"%@ AND (%@)",
filterSqlString, privacySqlString];
/* prepare mandatory fields */