mirror of
https://github.com/taobataoma/meanTorrent.git
synced 2026-07-16 00:23:04 +02:00
feat(history): show user account history on manage page
This commit is contained in:
@@ -27,7 +27,7 @@ module.exports = function () {
|
||||
}, {
|
||||
email: usernameOrEmail.toLowerCase()
|
||||
}]
|
||||
}, '-remarks').populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
|
||||
}, '-history -remarks').populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
|
||||
.populate('makers', 'name')
|
||||
.exec(function (err, user) {
|
||||
if (err) {
|
||||
|
||||
@@ -22,7 +22,7 @@ module.exports = function (app) {
|
||||
passport.deserializeUser(function (id, done) {
|
||||
User.findOne({
|
||||
_id: id
|
||||
}, '-salt -password -remarks')
|
||||
}, '-salt -password -history -remarks')
|
||||
.populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
|
||||
.populate('makers', 'name').exec(function (err, user) {
|
||||
done(err, user);
|
||||
|
||||
@@ -292,11 +292,11 @@ exports.updateUserStatus = function (req, res) {
|
||||
user: user._id,
|
||||
status: req.body.userStatus
|
||||
});
|
||||
//write history
|
||||
// history.insert(user._id, historyConfig.action.adminUpdateUserStatus, {
|
||||
// status: req.body.userStatus,
|
||||
// by: req.user._id
|
||||
// });
|
||||
// write history
|
||||
history.insert(user._id, historyConfig.action.adminUpdateUserStatus, {
|
||||
status: req.body.userStatus,
|
||||
by: req.user._id
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -625,6 +625,31 @@ exports.presentInvitations = function (req, res) {
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* getUserHistory
|
||||
* @param req
|
||||
* @param res
|
||||
*/
|
||||
exports.getUserHistory = function (req, res) {
|
||||
var user = req.model;
|
||||
|
||||
User.findById(user._id, 'history')
|
||||
.populate({
|
||||
path: 'history.params.by',
|
||||
model: 'User',
|
||||
select: 'displayName'
|
||||
})
|
||||
.exec(function (err, his) {
|
||||
if (err) {
|
||||
return res.status(422).send({
|
||||
message: errorHandler.getErrorMessage(err)
|
||||
});
|
||||
} else {
|
||||
res.json(his.history);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* list user seeding torrents
|
||||
* @param req
|
||||
@@ -750,7 +775,6 @@ exports.resetUserProfileImage = function (req, res) {
|
||||
}
|
||||
|
||||
res.json(user);
|
||||
|
||||
});
|
||||
};
|
||||
|
||||
@@ -764,7 +788,7 @@ exports.userByID = function (req, res, next, id) {
|
||||
});
|
||||
}
|
||||
|
||||
User.findById(id, '-salt -password -providerData')
|
||||
User.findById(id, '-salt -password -providerData -history')
|
||||
.populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
|
||||
.populate('makers', 'user name')
|
||||
.exec(function (err, user) {
|
||||
|
||||
@@ -19,7 +19,7 @@ exports.userByID = function (req, res, next, id) {
|
||||
|
||||
User.findOne({
|
||||
_id: id
|
||||
}, '-remarks')
|
||||
}, '-history -remarks')
|
||||
.populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
|
||||
.populate('makers', 'name')
|
||||
.exec(function (err, user) {
|
||||
|
||||
@@ -39,7 +39,8 @@ exports.invokeRolesPolicies = function () {
|
||||
{resources: '/api/users/:userId/uptotal', permissions: '*'},
|
||||
{resources: '/api/users/:userId/followers', permissions: '*'},
|
||||
{resources: '/api/users/:userId/following', permissions: '*'},
|
||||
{resources: '/api/users/:userId/resetImage', permissions: '*'}
|
||||
{resources: '/api/users/:userId/resetImage', permissions: '*'},
|
||||
{resources: '/api/users/:userId/history', permissions: '*'}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -52,6 +52,8 @@ module.exports = function (app) {
|
||||
.put(admin.resetUserProfileImage);
|
||||
app.route('/api/users/:userId/presentInvitations').all(adminPolicy.isAllowed)
|
||||
.put(admin.presentInvitations);
|
||||
app.route('/api/users/:userId/history')
|
||||
.get(admin.getUserHistory);
|
||||
|
||||
app.route('/api/users/:userId/VIPMonths/reset').all(adminPolicy.isAllowed)
|
||||
.put(admin.resetVIPData);
|
||||
|
||||
Reference in New Issue
Block a user