Fix for feature #1496
parent
446ef3467a
commit
3e221253ad
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
/* SOGoAppointmentFolders.m - this file is part of SOGo
|
/* SOGoAppointmentFolders.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2013 Inverse inc.
|
* Copyright (C) 2007-2014 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -56,13 +56,6 @@
|
||||||
|
|
||||||
#import "SOGoAppointmentFolders.h"
|
#import "SOGoAppointmentFolders.h"
|
||||||
|
|
||||||
@interface SOGoParentFolder (Private)
|
|
||||||
|
|
||||||
- (NSException *) _fetchPersonalFolders: (NSString *) sql
|
|
||||||
withChannel: (EOAdaptorChannel *) fc;
|
|
||||||
|
|
||||||
@end
|
|
||||||
|
|
||||||
static SoSecurityManager *sm = nil;
|
static SoSecurityManager *sm = nil;
|
||||||
|
|
||||||
@implementation SOGoAppointmentFolders
|
@implementation SOGoAppointmentFolders
|
||||||
|
@ -596,8 +589,9 @@ static SoSecurityManager *sm = nil;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSException *) _fetchPersonalFolders: (NSString *) sql
|
- (NSException *) fetchSpecialFolders: (NSString *) sql
|
||||||
withChannel: (EOAdaptorChannel *) fc
|
withChannel: (EOAdaptorChannel *) fc
|
||||||
|
andFolderType: (SOGoFolderType) folderType
|
||||||
{
|
{
|
||||||
BOOL isWebRequest;
|
BOOL isWebRequest;
|
||||||
NSException *error;
|
NSException *error;
|
||||||
|
@ -607,7 +601,7 @@ static SoSecurityManager *sm = nil;
|
||||||
SOGoWebAppointmentFolder *webFolder;
|
SOGoWebAppointmentFolder *webFolder;
|
||||||
NSString *name;
|
NSString *name;
|
||||||
|
|
||||||
error = [super _fetchPersonalFolders: sql withChannel: fc];
|
error = [super fetchSpecialFolders: sql withChannel: fc andFolderType: folderType];
|
||||||
if (!error)
|
if (!error)
|
||||||
{
|
{
|
||||||
isWebRequest = [[context request] handledByDefaultHandler];
|
isWebRequest = [[context request] handledByDefaultHandler];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoParentFolder.h - this file is part of SOGo
|
/* SOGoParentFolder.h - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2013 Inverse inc.
|
* Copyright (C) 2006-2014 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -24,6 +24,7 @@
|
||||||
#import "SOGoFolder.h"
|
#import "SOGoFolder.h"
|
||||||
#import "SOGoConstants.h"
|
#import "SOGoConstants.h"
|
||||||
|
|
||||||
|
@class EOAdaptorChannel;
|
||||||
@class NSMutableDictionary;
|
@class NSMutableDictionary;
|
||||||
@class NSString;
|
@class NSString;
|
||||||
@class WOResponse;
|
@class WOResponse;
|
||||||
|
@ -60,6 +61,10 @@
|
||||||
- (id) lookupPersonalFolder: (NSString *) name
|
- (id) lookupPersonalFolder: (NSString *) name
|
||||||
ignoringRights: (BOOL) ignoreRights;
|
ignoringRights: (BOOL) ignoreRights;
|
||||||
|
|
||||||
|
- (NSException *) fetchSpecialFolders: (NSString *) sql
|
||||||
|
withChannel: (EOAdaptorChannel *) fc
|
||||||
|
andFolderType: (SOGoFolderType) folderType;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#endif /* SOGOPARENTFOLDERS_H */
|
#endif /* SOGOPARENTFOLDERS_H */
|
||||||
|
|
Loading…
Reference in New Issue