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

Fix bug when user has been nuked

This commit is contained in:
Bryan Ashby 2018-12-17 11:56:07 -07:00
parent b1eea4f4b7
commit 8356f00ba6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/last_callers.js
View File

@ -42,29 +42,29 @@ exports.getModule = class LastCallersModule extends MenuModule {
async.waterfall( async.waterfall(
[ [
(next) => { (callback) => {
this.prepViewController('callers', 0, mciData.menu, err => { this.prepViewController('callers', 0, mciData.menu, err => {
return next(err); return callback(err);
}); });
}, },
(next) => { (callback) => {
this.fetchHistory( (err, loginHistory) => { this.fetchHistory( (err, loginHistory) => {
return next(err, loginHistory); return callback(err, loginHistory);
}); });
}, },
(loginHistory, next) => { (loginHistory, callback) => {
this.loadUserForHistoryItems(loginHistory, (err, updatedHistory) => { this.loadUserForHistoryItems(loginHistory, (err, updatedHistory) => {
return next(err, updatedHistory); return callback(err, updatedHistory);
}); });
}, },
(loginHistory, next) => { (loginHistory, callback) => {
const callersView = this.viewControllers.callers.getView(MciViewIds.callerList); const callersView = this.viewControllers.callers.getView(MciViewIds.callerList);
if(!callersView) { if(!callersView) {
return cb(Errors.MissingMci(`Missing caller list MCI ${MciViewIds.callerList}`)); return cb(Errors.MissingMci(`Missing caller list MCI ${MciViewIds.callerList}`));
} }
callersView.setItems(loginHistory); callersView.setItems(loginHistory);
callersView.redraw(); callersView.redraw();
return next(null); return callback(null);
} }
], ],
err => { err => {
@ -178,10 +178,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
}); });
} }
async.map(loginHistory, (item, next) => { async.map(loginHistory, (item, nextHistoryItem) => {
User.getUserName(item.userId, (err, userName) => { User.getUserName(item.userId, (err, userName) => {
if(err) { if(err) {
return cb(null, null); return nextHistoryItem(null, null);
} }
item.userName = item.text = userName; item.userName = item.text = userName;
@ -192,7 +192,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
item.realName = (props && props[UserProps.RealName]) || ''; item.realName = (props && props[UserProps.RealName]) || '';
if(!indicatorSumsSql) { if(!indicatorSumsSql) {
return next(null, item); return nextHistoryItem(null, item);
} }
sysDb.get( sysDb.get(
@ -210,7 +210,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
item.actions += indicator; item.actions += indicator;
}); });
} }
return next(null, item); return nextHistoryItem(null, item);
} }
); );
}); });