diff options
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r-- | client/src/app/+admin/users/user-edit/user-edit.ts | 1 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.ts | 28 |
2 files changed, 14 insertions, 15 deletions
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts index 07b087b5b..99ce5804b 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts | |||
@@ -1,7 +1,6 @@ | |||
1 | import { ServerService } from '../../../core' | 1 | import { ServerService } from '../../../core' |
2 | import { FormReactive } from '../../../shared' | 2 | import { FormReactive } from '../../../shared' |
3 | import { USER_ROLE_LABELS, VideoResolution } from '../../../../../../shared' | 3 | import { USER_ROLE_LABELS, VideoResolution } from '../../../../../../shared' |
4 | import { EditCustomConfigComponent } from '../../../+admin/config/edit-custom-config/' | ||
5 | import { ConfigService } from '@app/+admin/config/shared/config.service' | 4 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
6 | 5 | ||
7 | export abstract class UserEdit extends FormReactive { | 6 | export abstract class UserEdit extends FormReactive { |
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 33384dc35..ab2250722 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts | |||
@@ -55,20 +55,6 @@ export class UserListComponent extends RestTable implements OnInit { | |||
55 | ] | 55 | ] |
56 | } | 56 | } |
57 | 57 | ||
58 | protected loadData () { | ||
59 | this.selectedUsers = [] | ||
60 | |||
61 | this.userService.getUsers(this.pagination, this.sort, this.search) | ||
62 | .subscribe( | ||
63 | resultList => { | ||
64 | this.users = resultList.data | ||
65 | this.totalRecords = resultList.total | ||
66 | }, | ||
67 | |||
68 | err => this.notificationsService.error(this.i18n('Error'), err.message) | ||
69 | ) | ||
70 | } | ||
71 | |||
72 | openBanUserModal (users: User[]) { | 58 | openBanUserModal (users: User[]) { |
73 | for (const user of users) { | 59 | for (const user of users) { |
74 | if (user.username === 'root') { | 60 | if (user.username === 'root') { |
@@ -131,4 +117,18 @@ export class UserListComponent extends RestTable implements OnInit { | |||
131 | isInSelectionMode () { | 117 | isInSelectionMode () { |
132 | return this.selectedUsers.length !== 0 | 118 | return this.selectedUsers.length !== 0 |
133 | } | 119 | } |
120 | |||
121 | protected loadData () { | ||
122 | this.selectedUsers = [] | ||
123 | |||
124 | this.userService.getUsers(this.pagination, this.sort, this.search) | ||
125 | .subscribe( | ||
126 | resultList => { | ||
127 | this.users = resultList.data | ||
128 | this.totalRecords = resultList.total | ||
129 | }, | ||
130 | |||
131 | err => this.notificationsService.error(this.i18n('Error'), err.message) | ||
132 | ) | ||
133 | } | ||
134 | } | 134 | } |