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

merge of '04792139eaeaa95bfa70e66349320e38518eb8da' 

and 'f273242650aaecbcba217ab4ee2f04f5964f3ab0'

Monotone-Parent: 04792139eaeaa95bfa70e66349320e38518eb8da
Monotone-Parent: f273242650aaecbcba217ab4ee2f04f5964f3ab0
Monotone-Revision: 6d601c4d925dd7c8ff8648909b7bde1e3097127d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-07T12:45:25
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-06-07 12:45:25 +00:00
parent bef2e77733 49ab6e5bc2
commit 7c98ada223
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-06-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolders.m
(-toOneRelationShipKeys): with a request from iCal, we return
nothing to avoid confusing iCal 3 with non-collection resources.
* UI/Common/UIxAclEditor.m (-isPublicAccessEnabled): we now expose
the state of public access in order to not show the "anonymous"
user when not needed.

13
SoObjects/Appointments/SOGoAppointmentFolders.m
View File

@ -155,10 +155,10 @@
&& ![folder isSubscription])
{
folderObjectKey = [NSString stringWithFormat: @"%@.ics",
[folder nameInContainer]];
[folder nameInContainer]];
[folderObjectKeys addObject: folderObjectKey];
folderObjectKey = [NSString stringWithFormat: @"%@.xml",
[folder nameInContainer]];
[folder nameInContainer]];
[folderObjectKeys addObject: folderObjectKey];
}
}
@ -169,7 +169,14 @@
- (NSArray *) toOneRelationshipKeys
{
return [self folderObjectKeys];
NSArray *keys;
if ([[contextd request] isICal])
keys = [NSArray array];
else
keys = [self folderObjectKeys];
return keys;
}
- (id) lookupName: (NSString *) name