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

feat(users): show invited_by user info in account status center and admin manage page

Browse Source
This commit is contained in:
OldHawk
2017-09-13 15:05:28 +08:00
parent 09f1fbbb3b
commit 201d54d18a
7 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,6 +437,7 @@
FIRST_NAME: 'First name',
LAST_NAME: 'Last name',
DISPLAY_NAME: 'Display name',
INVITED_BY: 'Invited by',
EMAIL: 'Email',
PASSKEY: 'Passkey',
ROLE: 'Role',

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

@@ -437,6 +437,7 @@
FIRST_NAME: '姓',
LAST_NAME: '名',
DISPLAY_NAME: '显示昵称',
INVITED_BY: '邀请发送人',
EMAIL: '邮箱',
PASSKEY: 'Passkey',
ROLE: '用户角色',

2
modules/users/client/controllers/userinfo/userinfo.client.controller.js
View File

@@ -6,7 +6,7 @@
.controller('UserInfoController', UserInfoController);
UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout', 'MeanTorrentConfig',
'DebugConsoleService'];
'DebugConsoleService'];
function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout, MeanTorrentConfig, mtDebug) {
var vm = this;

8
modules/users/client/views/admin/view-user.client.view.html
View File

@@ -39,6 +39,14 @@
<dt class="h-line">{{ 'STATUS_FIELD.DISPLAY_NAME' | translate}}：</dt>
<dd class="h-line">{{ vm.user.displayName }}</dd>
<div ng-if="vm.user.invited_by">
<dt class="h-line">{{ 'STATUS_FIELD.INVITED_BY' | translate}}：</dt>
<dd class="h-line">
<span user-info="item.user.invited_by" info-name></span>
<span message-to="item.user.invited_by" to-class="message-to-icon"></span>
</dd>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.EMAIL' | translate}}：</dt>
<dd class="h-line">{{ vm.user.email }}</dd>

8
modules/users/client/views/status/account.client.view.html
View File

@@ -24,6 +24,14 @@
<dt class="h-line">{{ 'STATUS_FIELD.DISPLAY_NAME' | translate}}：</dt>
<dd class="h-line">{{ vm.user.displayName }}</dd>
<div ng-if="vm.user.invited_by">
<dt class="h-line">{{ 'STATUS_FIELD.INVITED_BY' | translate}}：</dt>
<dd class="h-line">
<span user-info="item.user.invited_by" info-name></span>
<span message-to="item.user.invited_by" to-class="message-to-icon"></span>
</dd>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.EMAIL' | translate}}：</dt>
<dd class="h-line">{{ vm.user.email }}</dd>

8
modules/users/client/views/userinfo/userinfo.client.view.html
View File

@@ -35,6 +35,14 @@
<dt class="h-line">{{ 'STATUS_FIELD.DISPLAY_NAME' | translate}}：</dt>
<dd class="h-line">{{ vm.user.displayName }}</dd>
<div ng-if="vm.user.invited_by">
<dt class="h-line">{{ 'STATUS_FIELD.INVITED_BY' | translate}}：</dt>
<dd class="h-line">
<span user-info="item.user.invited_by" info-name></span>
<span message-to="item.user.invited_by" to-class="message-to-icon"></span>
</dd>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.EMAIL' | translate}}：</dt>
<dd class="h-line">{{ vm.user.email }}</dd>

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

@@ -349,9 +349,7 @@ exports.userByID = function (req, res, next, id) {
});
}
User.findById(id, '-salt -password -providerData')
.populate('invited_by', 'username displayName profileImageURL')
.exec(function (err, user) {
User.findById(id, '-salt -password -providerData').populate('invited_by', 'username displayName profileImageURL').exec(function (err, user) {
if (err) {
return next(err);
} else if (!user) {