diff options
author | Chocobozzz <me@florianbigard.com> | 2020-05-05 09:44:53 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-05-05 13:54:30 +0200 |
commit | 8bb71f2e332726c207318e44b95e784f9740dc40 (patch) | |
tree | ee4c271342efec2593f353fa875ea93add6403f5 /client/src/app | |
parent | e5c86ba7c2fe5421b0d75943b03282e3f52de270 (diff) | |
download | PeerTube-8bb71f2e332726c207318e44b95e784f9740dc40.tar.gz PeerTube-8bb71f2e332726c207318e44b95e784f9740dc40.tar.zst PeerTube-8bb71f2e332726c207318e44b95e784f9740dc40.zip |
Add auth plugin info in users list
Diffstat (limited to 'client/src/app')
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.html | 7 | ||||
-rw-r--r-- | client/src/app/shared/users/user.model.ts | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 8b71dae79..d9612cf9c 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html | |||
@@ -46,6 +46,7 @@ | |||
46 | <th i18n>Email</th> | 46 | <th i18n>Email</th> |
47 | <th i18n pSortableColumn="videoQuotaUsed">Video quota <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th> | 47 | <th i18n pSortableColumn="videoQuotaUsed">Video quota <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th> |
48 | <th i18n>Role</th> | 48 | <th i18n>Role</th> |
49 | <th i18n>Auth plugin</th> | ||
49 | <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> | 50 | <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> |
50 | <th style="width: 50px;"></th> | 51 | <th style="width: 50px;"></th> |
51 | </tr> | 52 | </tr> |
@@ -97,7 +98,13 @@ | |||
97 | 98 | ||
98 | <td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td> | 99 | <td>{{ user.videoQuotaUsed }} / {{ user.videoQuota }}</td> |
99 | <td>{{ user.roleLabel }}</td> | 100 | <td>{{ user.roleLabel }}</td> |
101 | |||
102 | <td> | ||
103 | <ng-container *ngIf="user.pluginAuth">{{ user.pluginAuth }}</ng-container> | ||
104 | </td> | ||
105 | |||
100 | <td [title]="user.createdAt">{{ user.createdAt }}</td> | 106 | <td [title]="user.createdAt">{{ user.createdAt }}</td> |
107 | |||
101 | <td class="action-cell"> | 108 | <td class="action-cell"> |
102 | <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> | 109 | <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()"> |
103 | </my-user-moderation-dropdown> | 110 | </my-user-moderation-dropdown> |
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts index 76c57d2fb..3f6743bef 100644 --- a/client/src/app/shared/users/user.model.ts +++ b/client/src/app/shared/users/user.model.ts | |||
@@ -69,6 +69,8 @@ export class User implements UserServerModel { | |||
69 | noInstanceConfigWarningModal: boolean | 69 | noInstanceConfigWarningModal: boolean |
70 | noWelcomeModal: boolean | 70 | noWelcomeModal: boolean |
71 | 71 | ||
72 | pluginAuth: string | null | ||
73 | |||
72 | createdAt: Date | 74 | createdAt: Date |
73 | 75 | ||
74 | constructor (hash: Partial<UserServerModel>) { | 76 | constructor (hash: Partial<UserServerModel>) { |
@@ -112,6 +114,8 @@ export class User implements UserServerModel { | |||
112 | 114 | ||
113 | this.createdAt = hash.createdAt | 115 | this.createdAt = hash.createdAt |
114 | 116 | ||
117 | this.pluginAuth = hash.pluginAuth | ||
118 | |||
115 | if (hash.account !== undefined) { | 119 | if (hash.account !== undefined) { |
116 | this.account = new Account(hash.account) | 120 | this.account = new Account(hash.account) |
117 | } | 121 | } |