* Some more JSON -> HJSON cleanup
* More work on ACS system conditional matching. Now functional within menus. Still more work to go on various ACS checks themselves. * Use ACS for new user path: If new user requires activation, they will see 'DONE' then get logged off
This commit is contained in:
@@ -14,11 +14,11 @@ function getConditionalValue(client, condArray, memberName) {
|
||||
assert(_.isArray(condArray));
|
||||
assert(_.isString(memberName));
|
||||
|
||||
console.log(condArray)
|
||||
|
||||
condArray.forEach(function cond(c) {
|
||||
if(acsParser.parse(c.acs, { client : client })) {
|
||||
return c[memberName];
|
||||
}
|
||||
var matchCond = _.find(condArray, function cmp(cond) {
|
||||
return acsParser.parse(cond.acs, { client : client } );
|
||||
});
|
||||
|
||||
if(matchCond) {
|
||||
return matchCond[memberName];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user