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

feat(history): new history item of create user maker group

Browse Source
This commit is contained in:
OldHawk
2018-05-29 18:13:55 +08:00
parent 37cd2887fe
commit 35fc4aad10
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/env/torrents.js vendored
View File

@@ -698,6 +698,7 @@ module.exports = {
adminUpdateUserVIPData: {name: 'adminUpdateUserVIPData', enable: true},
adminPresentUserInvitations: {name: 'adminPresentUserInvitations', enable: true},
adminRemoveUserHnrWarning: {name: 'adminRemoveUserHnrWarning', enable: true},
adminCreateUserMakerGroup: {name: 'adminCreateUserMakerGroup', enable: true},
adminUserDelete: {name: 'adminUserDelete', enable: true},
adminUserEdit: {name: 'adminUserEdit', enable: true},
@@ -714,7 +715,6 @@ module.exports = {
adminCollectionSetRecommendLevel: {name: 'adminCollectionSetRecommendLevel', enable: true},
adminAlbumSetRecommendLevel: {name: 'adminAlbumSetRecommendLevel', enable: true},
adminTorrentSetReviewedStatus: {name: 'adminTorrentSetReviewedStatus', enable: true},
adminCreateMakerGroup: {name: 'adminCreateMakerGroup', enable: true},
adminCreateCollection: {name: 'adminCreateCollection', enable: true},
adminCreateAlbum: {name: 'adminCreateAlbum', enable: true},
adminDeleteBackupFiles: {name: 'adminDeleteBackupFiles', enable: true},
@@ -750,7 +750,8 @@ module.exports = {
adminUpdateUserDownloaded: {name: 'adminUpdateUserDownloaded', content: 'ADMIN_UPDATE_USER_DOWNLOADED', enable: true},
adminUpdateUserVIPData: {name: 'adminUpdateUserVIPData', content: 'ADMIN_UPDATE_USER_VIP_DATA', enable: true},
adminPresentUserInvitations: {name: 'adminPresentUserInvitations', content: 'ADMIN_PRESENT_USER_INVITATIONS', enable: true},
adminRemoveUserHnrWarning: {name: 'adminRemoveUserHnrWarning', content: 'ADMIN_REMOVE_USER_HNR_WARNING', enable: true}
adminRemoveUserHnrWarning: {name: 'adminRemoveUserHnrWarning', content: 'ADMIN_REMOVE_USER_HNR_WARNING', enable: true},
adminCreateUserMakerGroup: {name: 'adminCreateUserMakerGroup', content: 'ADMIN_CREATE_USER_MAKER_GROUP', enable: true}
}
},

9
modules/about/server/controllers/makers.server.controller.js
View File

@@ -9,6 +9,7 @@ var path = require('path'),
Maker = mongoose.model('Maker'),
Rating = mongoose.model('Rating'),
errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
history = require(path.resolve('./config/lib/history')),
traceLogCreate = require(path.resolve('./config/lib/tracelog')).create;
var traceConfig = config.meanTorrentConfig.trace;
@@ -16,6 +17,7 @@ var appConfig = config.meanTorrentConfig.app;
var mtDebug = require(path.resolve('./config/lib/debug'));
var serverMessage = require(path.resolve('./config/lib/server-message'));
var serverNoticeConfig = config.meanTorrentConfig.serverNotice;
var historyConfig = config.meanTorrentConfig.history;
/**
* Create an maker
@@ -60,10 +62,15 @@ exports.create = function (req, res) {
}
//create trace log
traceLogCreate(req, traceConfig.action.adminCreateMakerGroup, {
traceLogCreate(req, traceConfig.action.adminCreateUserMakerGroup, {
user: user._id,
name: maker.name
});
// write history
history.insert(user._id, historyConfig.action.adminCreateUserMakerGroup, {
name: maker.name,
by: req.user._id
});
}
});
} else {

3
modules/core/client/app/trans-string-en.js
View File

@@ -1725,7 +1725,8 @@
ADMIN_UPDATE_USER_DOWNLOADED: '`{{by.displayName}}` update account downloaded: `{{downloaded | bytes:2}}`',
ADMIN_UPDATE_USER_VIP_DATA: '`{{by.displayName}}` update account vip data: `{{months}}` months',
ADMIN_PRESENT_USER_INVITATIONS: '`{{by.displayName}}` present `{{numbers}}` official invitations, expires `{{days}}` days',
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` remove H&R warning, complete id: `{{complete}}`'
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` remove H&R warning, complete id: `{{complete}}`',
ADMIN_CREATE_USER_MAKER_GROUP: '`{{by.displayName}}` create user maker group: `-={{name}}=-`'
},
//server returned string

3
modules/core/client/app/trans-string-zh-tw.js
View File

@@ -1725,7 +1725,8 @@
ADMIN_UPDATE_USER_DOWNLOADED: '`{{by.displayName}}` 修改帳戶下載量: `{{downloaded | bytes:2}}`',
ADMIN_UPDATE_USER_VIP_DATA: '`{{by.displayName}}` 修改帳戶 VIP 數據: `{{months}}` 個月',
ADMIN_PRESENT_USER_INVITATIONS: '`{{by.displayName}}` 贈送 `{{numbers}}` 個官方邀請函, 有效期 `{{days}}` 天',
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` 移除 H&R 警告, complete id: `{{complete}}`'
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` 移除 H&R 警告, complete id: `{{complete}}`',
ADMIN_CREATE_USER_MAKER_GROUP: '`{{by.displayName}}` 創建用戶資源小組: `-={{name}}=-`'
},
//server returned string

3
modules/core/client/app/trans-string-zh.js
View File

@@ -1725,7 +1725,8 @@
ADMIN_UPDATE_USER_DOWNLOADED: '`{{by.displayName}}` 修改帐户下载量: `{{downloaded | bytes:2}}`',
ADMIN_UPDATE_USER_VIP_DATA: '`{{by.displayName}}` 修改帐户 VIP 数据: `{{months}}` 个月',
ADMIN_PRESENT_USER_INVITATIONS: '`{{by.displayName}}` 赠送 `{{numbers}}` 个官方邀请函, 有效期 `{{days}}` 天',
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` 移除 H&R 警告, complete id: `{{complete}}`'
ADMIN_REMOVE_USER_HNR_WARNING: '`{{by.displayName}}` 移除 H&R 警告, complete id: `{{complete}}`',
ADMIN_CREATE_USER_MAKER_GROUP: '`{{by.displayName}}` 创建用户资源小组: `-={{name}}=-`'
},
//server returned string