Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs
This commit is contained in:
commit
ac4ab81897
|
@ -105,12 +105,15 @@ exports.getModule = class LastCallersModule extends MenuModule {
|
||||||
item.ts = moment(item.timestamp).format(dateTimeFormat);
|
item.ts = moment(item.timestamp).format(dateTimeFormat);
|
||||||
|
|
||||||
User.getUserName(item.userId, (err, userName) => {
|
User.getUserName(item.userId, (err, userName) => {
|
||||||
item.userName = userName;
|
item.userName = userName || 'N/A';
|
||||||
|
|
||||||
User.loadProperties(item.userId, getPropOpts, (err, props) => {
|
User.loadProperties(item.userId, getPropOpts, (err, props) => {
|
||||||
if(!err) {
|
if(!err) {
|
||||||
item.location = props.location;
|
item.location = props.location;
|
||||||
item.affiliation = item.affils = props.affiliation;
|
item.affiliation = item.affils = props.affiliation;
|
||||||
|
} else {
|
||||||
|
item.location = 'N/A';
|
||||||
|
item.affiliation = 'N/A';
|
||||||
}
|
}
|
||||||
return next();
|
return next();
|
||||||
});
|
});
|
||||||
|
|
|
@ -341,6 +341,7 @@
|
||||||
// Canceling this form logs off vs falling back to matrix
|
// Canceling this form logs off vs falling back to matrix
|
||||||
//
|
//
|
||||||
newUserApplicationSsh: {
|
newUserApplicationSsh: {
|
||||||
|
module: nua
|
||||||
art: NUA
|
art: NUA
|
||||||
fallback: logoff
|
fallback: logoff
|
||||||
options: {
|
options: {
|
||||||
|
|
Loading…
Reference in New Issue