parent
213ef0efb5
commit
7bd4173388
|
@ -282,11 +282,6 @@ static NSArray *childRecordFields = nil;
|
||||||
else
|
else
|
||||||
name = primaryDN;
|
name = primaryDN;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
[self errorWithFormat: @"(%s): No c_foldername defined (%@)",
|
|
||||||
__PRETTY_FUNCTION__, [container defaultFolderName]];
|
|
||||||
}
|
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
@ -347,12 +342,7 @@ static NSArray *childRecordFields = nil;
|
||||||
[fc cancelFetch];
|
[fc cancelFetch];
|
||||||
[cm releaseChannel: fc];
|
[cm releaseChannel: fc];
|
||||||
}
|
}
|
||||||
NS_HANDLER
|
NS_HANDLER;
|
||||||
{
|
|
||||||
[self errorWithFormat: @"(%s): Could not fetch c_foldername from %@ for c_path %@",
|
|
||||||
__PRETTY_FUNCTION__, [folderLocation gcsTableName], ocsPath];
|
|
||||||
[self errorWithFormat: @"%@", localException];
|
|
||||||
}
|
|
||||||
NS_ENDHANDLER;
|
NS_ENDHANDLER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,11 +439,7 @@ static NSArray *childRecordFields = nil;
|
||||||
record = [[self folderManager] recordAtPath: _path];
|
record = [[self folderManager] recordAtPath: _path];
|
||||||
|
|
||||||
if (!record)
|
if (!record)
|
||||||
{
|
return nil;
|
||||||
[self errorWithFormat: @"(%s): Can't find record at path %@",
|
|
||||||
__PRETTY_FUNCTION__, _path];
|
|
||||||
return nil;
|
|
||||||
}
|
|
||||||
|
|
||||||
[cache setValue: [record jsonRepresentation] forKey: _path];
|
[cache setValue: [record jsonRepresentation] forKey: _path];
|
||||||
}
|
}
|
||||||
|
|
|
@ -289,7 +289,7 @@ static SoSecurityManager *sm = nil;
|
||||||
|
|
||||||
// We check with -ocsFolderForPath if the folder also exists in the database.
|
// We check with -ocsFolderForPath if the folder also exists in the database.
|
||||||
// This is important because user A could delete folder X, and user B has subscribed to it.
|
// This is important because user A could delete folder X, and user B has subscribed to it.
|
||||||
// If the "default roles" are enabled for calendars/address books, -validatePermission:.. will
|
// If the "default roles" are enabled for calendars/address books, -validatePersmission:.. will
|
||||||
// work (grabbing the default role) and the deleted resource will be incorrectly returned.
|
// work (grabbing the default role) and the deleted resource will be incorrectly returned.
|
||||||
if (subscribedFolder
|
if (subscribedFolder
|
||||||
&& [subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]]
|
&& [subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]]
|
||||||
|
|
Loading…
Reference in New Issue