* 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:
Bryan Ashby 2015-11-14 12:22:21 -07:00
parent 03f9ad4789
commit 688e46bc47
9 changed files with 93 additions and 68 deletions

View file

@ -85,9 +85,9 @@ User.StandardPropertyGroups = {
};
User.AccountStatus = {
disabled : -1,
inactive : 0,
active : 1,
disabled : 0,
inactive : 1,
active : 2,
};
User.prototype.load = function(userId, cb) {