Calendar module optimizations in multidomain setup

Conflicts:
	NEWS
	UI/Common/UIxUserRightsEditor.m
This commit is contained in:
Francis Lachapelle committed 2015-07-23 12:06:54 -04:00
1 parent 8f49778501
commit 613f05ac02
9 files changed
+68 -34

No files matched your search

+12 -2
View File
@@ -195,11 +195,21 @@
- (NSString *) currentUserDisplayName
{
NSDictionary *infos;
NSString *uid;
SOGoUserManager *um;
um = [SOGoUserManager sharedUserManager];
return [um getFullEmailForUID: [self currentUser]];
uid = [self currentUser];
infos = [um contactInfosForUserWithUIDorEmail: uid inDomain: [[context activeUser] domain]];
if (infos)
{
return [NSString stringWithFormat: @"%@ <%@>",
[infos objectForKey: @"cn"],
[infos objectForKey: @"c_email"]];
}
else
return uid;
}
- (NSDictionary *) currentUserInfos