Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-02-28 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(maker): admin oper can create maker group for user now, in user manager page

Browse Source
This commit is contained in:
OldHawk
2017-10-19 18:44:22 +08:00
parent 7eb4a45522
commit 18f3af75cb
25 changed files with 541 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/users/server/controllers/admin.server.controller.js
View File

@@ -155,6 +155,7 @@ exports.list = function (req, res) {
User.find(condition, '-salt -password -providerData')
.sort('-created')
.populate('invited_by', 'username displayName profileImageURL isVip uploaded downloaded')
.populate('makers', 'name')
.skip(skip)
.limit(limit)
.exec(function (err, users) {
@@ -508,14 +509,17 @@ exports.userByID = function (req, res, next, id) {
});
}
User.findById(id, '-salt -password -providerData').populate('invited_by', 'username displayName profileImageURL').exec(function (err, user) {
if (err) {
return next(err);
} else if (!user) {
return next(new Error('Failed to load user ' + id));
}
User.findById(id, '-salt -password -providerData')
.populate('invited_by', 'username displayName profileImageURL')
.populate('makers', 'name')
.exec(function (err, user) {
if (err) {
return next(err);
} else if (!user) {
return next(new Error('Failed to load user ' + id));
}
req.model = user;
next();
});
req.model = user;
next();
});
};