amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-18 03:47:59 +00:00
Code Issues Projects Releases Wiki Activity

Created user-modal.js, code refactoring

Browse Source 
Conflicts:

	UI/Common/UIxAclEditor.m
	UI/Common/UIxUserRightsEditor.m
	UI/Common/product.plist
	UI/Contacts/UIxContactsUserRightsEditor.m
	UI/Templates/ContactsUI/UIxContactFoldersView.wox
	UI/WebServerResources/js/Common/resource.js
	UI/WebServerResources/js/ContactsUI.js
This commit is contained in:
Alexandre Cloutier
2014-11-11 22:32:45 -05:00
committed by Francis Lachapelle
parent ff5b25972f
commit 3f27e9bb57
11 changed files with 338 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxAclEditor.m
+5 -5
View File
@@ -80,7 +80,7 @@
return defaultUserID;
}
- (NSArray *) usersForObject
- (id <WOActionResults>) aclsAction
{
NSEnumerator *aclsEnum;
NSString *currentUID, *ownerLogin;
@@ -105,14 +105,14 @@
object = [NSDictionary dictionaryWithObjectsAndKeys: currentUser, @"uid",
[self currentUserClass], @"userClass",
[self currentUserDisplayName], @"displayName",
[NSNumber numberWithBool:[self currentUserIsSubscribed]], @"isSubscribed", nil];
[users setObject:object forKey: currentUID];
[NSNumber numberWithBool: [self currentUserIsSubscribed]], @"isSubscribed", nil];
[users setObject: object forKey: currentUID];
}
}
// Adding the Any authenticated user and the public access
[users setObject:[NSDictionary dictionaryWithObjectsAndKeys: @"<default>", @"uid", [self labelForKey: @"Any Authenticated User"], @"displayName", @"public-user", @"userClass", nil] forKey: @"<default>"];
[users setObject: [NSDictionary dictionaryWithObjectsAndKeys: @"<default>", @"uid", [self labelForKey: @"Any Authenticated User"], @"displayName", @"public-user", @"userClass", nil] forKey: @"<default>"];
if ([self isPublicAccessEnabled])
[users setObject:[NSDictionary dictionaryWithObjectsAndKeys: @"anonymous", @"uid", [self labelForKey: @"Public Access"], @"displayName", @"public-user", @"userClass", nil] forKey: @"anonymous"];
[users setObject: [NSDictionary dictionaryWithObjectsAndKeys: @"anonymous", @"uid", [self labelForKey: @"Public Access"], @"displayName", @"public-user", @"userClass", nil] forKey: @"anonymous"];
prepared = YES;
}