(fix) integrated latest OC changes

This commit is contained in:
Ludovic Marcotte
2016-06-23 08:58:25 -04:00
parent bd0ff6043c
commit 4a74f00adb
72 changed files with 2837 additions and 1987 deletions
+15 -16
View File
@@ -51,25 +51,24 @@
{
NSEnumerator *roles, *types;
NSString *role, *type;
unsigned int length;
roles = [userRights objectEnumerator];
role = [roles nextObject];
while (role)
types = [[self rightTypes] objectEnumerator];
type = [types nextObject];
while (type)
{
types = [[self rightTypes] objectEnumerator];
type = [types nextObject];
while (type)
{
if ([role hasPrefix: type])
{
length = [type length];
[rights setObject: [role substringFromIndex: length]
forKey: type];
}
type = [types nextObject];
}
roles = [userRights objectEnumerator];
role = [roles nextObject];
while (role)
{
if ([role hasPrefix: type])
{
[rights setObject: [role substringFromIndex: [type length]]
forKey: type];
break;
}
role = [roles nextObject];
}
type = [types nextObject];
}
}