merge of '4133aa51d99944a0881e6439951b7325553c5309'
and '787fab4426e6ea6fab09ccfcc61ecc658e06ed5e' Monotone-Parent: 4133aa51d99944a0881e6439951b7325553c5309 Monotone-Parent: 787fab4426e6ea6fab09ccfcc61ecc658e06ed5e Monotone-Revision: 075df52db5284515c4b7994dd7a105a4399e3e3d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-13T18:51:19 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
6b16baa457
|
@ -1,3 +1,9 @@
|
||||||
|
2009-06-12 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* UI/Contacts/UIxContactEditor.m ([UIxContactEditor
|
||||||
|
-addressBooksList]): LDAP-based addressbooks must not be
|
||||||
|
editable, even for super users.
|
||||||
|
|
||||||
2009-06-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2009-06-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/SOGo/SOGoUserFolder.m (-davUserQuery:): do not return
|
* SoObjects/SOGo/SOGoUserFolder.m (-davUserQuery:): do not return
|
||||||
|
|
Binary file not shown.
|
@ -138,7 +138,7 @@
|
||||||
|
|
||||||
// We check to see if it's a group
|
// We check to see if it's a group
|
||||||
classes = [[entry attributeWithName: @"objectClass"] allStringValues];
|
classes = [[entry attributeWithName: @"objectClass"] allStringValues];
|
||||||
NSLog(@"classes = %@", classes);
|
NSLog(@"classes for %@ = %@", theValue, classes);
|
||||||
|
|
||||||
// Found a group, let's return it.
|
// Found a group, let's return it.
|
||||||
if ([classes containsObject: @"group"] ||
|
if ([classes containsObject: @"group"] ||
|
||||||
|
|
|
@ -186,9 +186,10 @@
|
||||||
while (currentFolder)
|
while (currentFolder)
|
||||||
{
|
{
|
||||||
if ([currentFolder isEqual: folder] ||
|
if ([currentFolder isEqual: folder] ||
|
||||||
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
([currentFolder isKindOfClass: [SOGoContactGCSFolder class]] &&
|
||||||
onObject: currentFolder
|
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
||||||
inContext: context])
|
onObject: currentFolder
|
||||||
|
inContext: context]))
|
||||||
[addressBooksList addObject: currentFolder];
|
[addressBooksList addObject: currentFolder];
|
||||||
currentFolder = [folders nextObject];
|
currentFolder = [folders nextObject];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue