mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-30 09:19:28 +00:00
Monotone-Parent: 301f32f12ce075dd8fc334d216d4ffd2f04fc0df
Monotone-Revision: 25a776bd6b15aa10f240bacd8adc2804905b3aa3 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-07-04T20:13:49 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
2007-07-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -ocsFolder]): create
|
||||
the folder only if the current user is the owner of the future
|
||||
folder.
|
||||
|
||||
* SoObjects/Appointments/SOGoCalendarComponent.m
|
||||
([SOGoCalendarComponent -contentAsString]): we return the content
|
||||
based on the permissions returned by the security manager instead
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#import <Foundation/NSURL.h>
|
||||
|
||||
#import <NGObjWeb/SoObject.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGExtensions/NSNull+misc.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <EOControl/EOQualifier.h>
|
||||
@@ -38,6 +39,7 @@
|
||||
#import <SaxObjC/XMLNamespaces.h>
|
||||
|
||||
#import "SOGoPermissions.h"
|
||||
#import "SOGoUser.h"
|
||||
|
||||
#import "SOGoFolder.h"
|
||||
|
||||
@@ -151,11 +153,14 @@ static NSString *defaultUserID = @"<default>";
|
||||
- (GCSFolder *) ocsFolder
|
||||
{
|
||||
GCSFolder *folder;
|
||||
NSString *userLogin;
|
||||
|
||||
if (!ocsFolder)
|
||||
{
|
||||
ocsFolder = [self ocsFolderForPath: [self ocsPath]];
|
||||
userLogin = [[context activeUser] login];
|
||||
if (!ocsFolder
|
||||
&& [userLogin isEqualToString: [self ownerInContext: context]]
|
||||
&& [self folderIsMandatory]
|
||||
&& [self create])
|
||||
ocsFolder = [self ocsFolderForPath: [self ocsPath]];
|
||||
|
||||
Reference in New Issue
Block a user