Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4959 from pichalite/login-sessions

Browse Source 
move login sessions section to account info route
This commit is contained in:
Barış Soner Uşaklı
2016-08-18 13:18:57 +03:00
committed by GitHub
parent a36af97c0c 0b431ec41c
commit 37f7b89e2a
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/accounts/info.js
View File

@@ -18,7 +18,8 @@ infoController.get = function(req, res, next) {
async.parallel({ async.parallel({
ips: async.apply(user.getIPs, res.locals.uid, 4), ips: async.apply(user.getIPs, res.locals.uid, 4),
history: async.apply(user.getModerationHistory, res.locals.uid), history: async.apply(user.getModerationHistory, res.locals.uid),
fields: async.apply(user.getUserFields, res.locals.uid, ['banned']) fields: async.apply(user.getUserFields, res.locals.uid, ['banned']),
sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID)
}, function(err, data) { }, function(err, data) {
if (err) { if (err) {
return next(err); return next(err);
@@ -28,7 +29,8 @@ infoController.get = function(req, res, next) {
ips: data.ips, ips: data.ips,
history: data.history history: data.history
}, data.fields); }, data.fields);
userData.sessions = data.sessions;
userData.title = '[[pages:account/info]]'; userData.title = '[[pages:account/info]]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:account_info]]'}]); userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:account_info]]'}]);

8
src/controllers/accounts/settings.js
View File

@@ -37,19 +37,13 @@ settingsController.get = function(req, res, callback) {
}, },
homePageRoutes: function(next) { homePageRoutes: function(next) {
getHomePageRoutes(next); getHomePageRoutes(next);
}, }
ips: function (next) {
user.getIPs(userData.uid, 4, next);
},
sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID)
}, next); }, next);
}, },
function(results, next) { function(results, next) {
userData.settings = results.settings; userData.settings = results.settings;
userData.languages = results.languages; userData.languages = results.languages;
userData.homePageRoutes = results.homePageRoutes; userData.homePageRoutes = results.homePageRoutes;
userData.ips = results.ips;
userData.sessions = results.sessions;
plugins.fireHook('filter:user.customSettings', {settings: results.settings, customSettings: [], uid: req.uid}, next); plugins.fireHook('filter:user.customSettings', {settings: results.settings, customSettings: [], uid: req.uid}, next);
}, },
function(data, next) { function(data, next) {