diff --git a/config/env/torrents.js b/config/env/torrents.js index 91b0b01d..62c87188 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -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} } }, diff --git a/modules/about/server/controllers/makers.server.controller.js b/modules/about/server/controllers/makers.server.controller.js index 4004ce42..cc8a63f7 100644 --- a/modules/about/server/controllers/makers.server.controller.js +++ b/modules/about/server/controllers/makers.server.controller.js @@ -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 { diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 217f24ec..c35fa398 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -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 diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js index 9d2fec29..41f4b6e0 100644 --- a/modules/core/client/app/trans-string-zh-tw.js +++ b/modules/core/client/app/trans-string-zh-tw.js @@ -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 diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 87221bcf..780b5cf5 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -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