diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 03034343..8af9af8f 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -318,9 +318,20 @@ SET_STATUS_FAILED: 'set user status failed', SCORE_NUMBER: 'Score number', + SCORE_TITLE: 'Edit user score', SET_SCORE_SUCCESSFULLY: 'set user score successfully', SET_SCORE_FAILED: 'set user score failed', + UPLOADED_NUMBER: 'Uploaded number', + UPLOADED_TITLE: 'Edit user uploaded (unit: GB)', + SET_UPLOADED_SUCCESSFULLY: 'set user uploaded successfully', + SET_UPLOADED_FAILED: 'set user uploaded failed', + + DOWNLOADED_NUMBER: 'Downloaded number', + DOWNLOADED_TITLE: 'Edit user downloaded (unit: GB)', + SET_DOWNLOADED_SUCCESSFULLY: 'set user downloaded successfully', + SET_DOWNLOADED_FAILED: 'set user downloaded failed', + //vip,rules views BUTTON_DNATE: 'Donate Vip', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 571e1407..c6336fad 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -318,9 +318,20 @@ SET_STATUS_FAILED: '用户帐号状态设置失败', SCORE_NUMBER: '积分数', + SCORE_TITLE: '修改积分', SET_SCORE_SUCCESSFULLY: '用户积分设置成功', SET_SCORE_FAILED: '用户积分设置失败', + UPLOADED_NUMBER: '上传量', + UPLOADED_TITLE: '修改上传量 (单位: GB)', + SET_UPLOADED_SUCCESSFULLY: '用户上传量设置成功', + SET_UPLOADED_FAILED: '用户上传量设置失败', + + DOWNLOADED_NUMBER: '下载量', + DOWNLOADED_TITLE: '修改下载量 (单位: GB)', + SET_DOWNLOADED_SUCCESSFULLY: '用户下载量设置成功', + SET_DOWNLOADED_FAILED: '用户下载量设置成功', + //vip,rules views BUTTON_DNATE: '捐 赠 Vip', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index af9aafcd..22cb96d3 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -924,6 +924,32 @@ body { .set-score-popover-form { input { - max-width: 150px; + max-width: 160px; + } +} + +.set-uploaded-popover { + max-width: 250px; + max-height: 150px; + width: 250px; + height: auto; +} + +.set-uploaded-popover-form { + input { + max-width: 160px; + } +} + +.set-downloaded-popover { + max-width: 250px; + max-height: 150px; + width: 250px; + height: auto; +} + +.set-downloaded-popover-form { + input { + max-width: 160px; } } diff --git a/modules/users/client/controllers/admin/user.client.controller.js b/modules/users/client/controllers/admin/user.client.controller.js index 79452889..da837b8e 100644 --- a/modules/users/client/controllers/admin/user.client.controller.js +++ b/modules/users/client/controllers/admin/user.client.controller.js @@ -20,11 +20,23 @@ vm.isContextUserSelf = isContextUserSelf; vm.setUserScorePopover = { - title: 'Edit user score', + title: 'SCORE_TITLE', templateUrl: 'set-user-score.html', isOpen: false }; + vm.setUserUploadedPopover = { + title: 'UPLOADED_TITLE', + templateUrl: 'set-user-uploaded.html', + isOpen: false + }; + + vm.setUserDownloadedPopover = { + title: 'DOWNLOADED_TITLE', + templateUrl: 'set-user-downloaded.html', + isOpen: false + }; + /** * remove * @param user @@ -136,21 +148,79 @@ userId: user._id, userScore: vm.setUserScorePopover.number }) - .then(onSetRoleSuccess) - .catch(onSetRoleError); + .then(onSetScoreSuccess) + .catch(onSetScoreError); vm.setUserScorePopover.isOpen = false; } - function onSetRoleSuccess(response) { + function onSetScoreSuccess(response) { vm.user = response; NotifycationService.showSuccessNotify('SET_SCORE_SUCCESSFULLY'); } - function onSetRoleError(response) { + function onSetScoreError(response) { NotifycationService.showErrorNotify(response.data.message, 'SET_SCORE_FAILED'); } }; + + /** + * setUserUploaded + */ + vm.setUserUploaded = function () { + if (isNaN(vm.setUserUploadedPopover.number)) { + return false; + } else { + var user = vm.user; + AdminService.setUserUploaded({ + userId: user._id, + userUploaded: vm.setUserUploadedPopover.number * 1024 * 1024 * 1024 + }) + .then(onSetUploadedSuccess) + .catch(onSetUploadedError); + + vm.setUserUploadedPopover.isOpen = false; + } + + function onSetUploadedSuccess(response) { + vm.user = response; + + NotifycationService.showSuccessNotify('SET_UPLOADED_SUCCESSFULLY'); + } + + function onSetUploadedError(response) { + NotifycationService.showErrorNotify(response.data.message, 'SET_UPLOADED_FAILED'); + } + }; + + /** + * setUserDownloaded + */ + vm.setUserDownloaded = function () { + if (isNaN(vm.setUserDownloadedPopover.number)) { + return false; + } else { + var user = vm.user; + AdminService.setUserDownloaded({ + userId: user._id, + userDownloaded: vm.setUserDownloadedPopover.number * 1024 * 1024 * 1024 + }) + .then(onSetDownloadedSuccess) + .catch(onSetDownloadedError); + + vm.setUserDownloadedPopover.isOpen = false; + } + + function onSetDownloadedSuccess(response) { + vm.user = response; + + NotifycationService.showSuccessNotify('SET_DOWNLOADED_SUCCESSFULLY'); + } + + function onSetDownloadedError(response) { + NotifycationService.showErrorNotify(response.data.message, 'SET_DOWNLOADED_FAILED'); + } + }; } }()); diff --git a/modules/users/client/services/users.client.service.js b/modules/users/client/services/users.client.service.js index 6d1095d2..374ca557 100644 --- a/modules/users/client/services/users.client.service.js +++ b/modules/users/client/services/users.client.service.js @@ -114,6 +114,22 @@ userId: '@userId', userScore: '@userScore' } + }, + updateUserUploaded: { + method: 'POST', + url: '/api/users/:userId/uploaded', + params: { + userId: '@userId', + userUploaded: '@userUploaded' + } + }, + updateUserDownloaded: { + method: 'POST', + url: '/api/users/:userId/downloaded', + params: { + userId: '@userId', + userDownloaded: '@userDownloaded' + } } }); @@ -126,6 +142,12 @@ }, setUserScore: function (params) { return this.updateUserScore(params).$promise; + }, + setUserUploaded: function (params) { + return this.updateUserUploaded(params).$promise; + }, + setUserDownloaded: function (params) { + return this.updateUserDownloaded(params).$promise; } }); diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html index a0e06dc3..3255649f 100644 --- a/modules/users/client/views/admin/view-user.client.view.html +++ b/modules/users/client/views/admin/view-user.client.view.html @@ -112,7 +112,14 @@ {{ vm.user.uploaded | bytes:2 }}