crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Some more JSON -> HJSON cleanup

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

9
core/menu_util.js
View File

@@ -10,6 +10,7 @@ var asset = require('./asset.js');
var theme = require('./theme.js');
var configCache = require('./config_cache.js');
var MCIViewFactory = require('./mci_view_factory.js').MCIViewFactory;
var acsUtil = require('./acs_util.js');
var fs = require('fs');
var paths = require('path');
@@ -220,8 +221,12 @@ function handleAction(client, formData, conf) {
}
function handleNext(client, nextSpec, conf) {
assert(_.isString(nextSpec));
assert(_.isString(nextSpec) || _.isArray(nextSpec));
if(_.isArray(nextSpec)) {
nextSpec = acsUtil.getConditionalValue(client, nextSpec, 'next');
}
var nextAsset = asset.getAssetWithShorthand(nextSpec, 'menu');
conf = conf || {};