amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-07 22:48:01 +00:00
Code Issues Projects Releases Wiki Activity

file lost through rebasing

Browse Source
This commit is contained in:
Alexandre Cloutier
2015-06-11 15:27:06 -04:00
committed by Francis Lachapelle
parent edbd661104
commit 3bf1224c9b
8 changed files with 260 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxUserRightsEditor.m
+18 -20
View File
@@ -119,25 +119,25 @@
if ([newUID length] > 0)
{
if (!defaultUserID)
ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
um = [SOGoUserManager sharedUserManager];
if ([newUID isEqualToString: defaultUserID] || [newUID isEqualToString: @"anonymous"]
|| [[um getEmailForUID: newUID] length] > 0)
{
if (![newUID hasPrefix: @"@"])
{
{
if (![newUID hasPrefix: @"@"])
{
domain = [[context activeUser] domain];
group = [SOGoGroup groupWithIdentifier: newUID inDomain: domain];
if (group)
newUID = [NSString stringWithFormat: @"@%@", newUID];
}
group = [SOGoGroup groupWithIdentifier: newUID inDomain: domain];
if (group)
newUID = [NSString stringWithFormat: @"@%@", newUID];
}
ASSIGN (uid, newUID);
clientObject = [self clientObject];
[userRights addObjectsFromArray: [clientObject aclsForUser: uid]];
clientObject = [self clientObject];
[userRights addObjectsFromArray: [clientObject aclsForUser: uid]];
response = YES;
}
}
}
return response;
}
@@ -183,13 +183,11 @@
id <WOActionResults> response;
if (![self _initRights])
response = [NSException exceptionWithHTTPStatus: 403
reason: @"No such user."];
response = [self responseWithStatus: 403
andString: @"No such user."];
else
{
[self prepareRightsForm];
response = self;
}
response = [self responseWithStatus: 200
andString:[[self userRightsForObject] jsonRepresentation]];
return response;
}
@@ -237,6 +235,7 @@
{
response = [self responseWithStatus: 403
andString: @"No such user."];
return response;
}
else
{
@@ -247,10 +246,9 @@
dd = [[context activeUser] domainDefaults];
if (![o isEqualToArray: userRights] && [dd aclSendEMailNotifications])
[self sendACLAdvisoryTemplateForObject: [self clientObject]];
response = [self jsCloseWithRefreshMethod: nil];
}
}
response = [self jsCloseWithRefreshMethod: nil];
return response;
}
@@ -267,7 +265,7 @@
}
- (void) appendExclusiveRight: (NSString *) newRight
fromList: (NSArray *) list
fromList: (NSArray *) list
{
[userRights removeObjectsInArray: list];
[self appendRight: newRight];