amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-22 21:39:28 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 85281fd909e8f0d613327a321fb964be7ca872ca

Browse Source 
Monotone-Revision: f273242650aaecbcba217ab4ee2f04f5964f3ab0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-07T12:45:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-07 12:45:22 +00:00
parent 3df8728a68
commit 49ab6e5bc2
2 changed files with 14 additions and 3 deletions
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