diff options
Diffstat (limited to 'client/src/app/+admin/users/user-list/user-list.component.ts')
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.ts | 12 |
1 files changed, 4 insertions, 8 deletions
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 1c60adf89..e02d8e1ad 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 | |||
@@ -5,7 +5,7 @@ import { AuthService, ConfirmService, Notifier, RestPagination, RestTable, Serve | |||
5 | import { AdvancedInputFilter } from '@app/shared/shared-forms' | 5 | import { AdvancedInputFilter } from '@app/shared/shared-forms' |
6 | import { DropdownAction } from '@app/shared/shared-main' | 6 | import { DropdownAction } from '@app/shared/shared-main' |
7 | import { UserBanModalComponent } from '@app/shared/shared-moderation' | 7 | import { UserBanModalComponent } from '@app/shared/shared-moderation' |
8 | import { ServerConfig, User, UserRole } from '@shared/models' | 8 | import { User, UserRole } from '@shared/models' |
9 | 9 | ||
10 | type UserForList = User & { | 10 | type UserForList = User & { |
11 | rawVideoQuota: number | 11 | rawVideoQuota: number |
@@ -41,8 +41,9 @@ export class UserListComponent extends RestTable implements OnInit { | |||
41 | } | 41 | } |
42 | ] | 42 | ] |
43 | 43 | ||
44 | requiresEmailVerification = false | ||
45 | |||
44 | private _selectedColumns: string[] | 46 | private _selectedColumns: string[] |
45 | private serverConfig: ServerConfig | ||
46 | 47 | ||
47 | constructor ( | 48 | constructor ( |
48 | protected route: ActivatedRoute, | 49 | protected route: ActivatedRoute, |
@@ -60,10 +61,6 @@ export class UserListComponent extends RestTable implements OnInit { | |||
60 | return this.auth.getUser() | 61 | return this.auth.getUser() |
61 | } | 62 | } |
62 | 63 | ||
63 | get requiresEmailVerification () { | ||
64 | return this.serverConfig.signup.requiresEmailVerification | ||
65 | } | ||
66 | |||
67 | get selectedColumns () { | 64 | get selectedColumns () { |
68 | return this._selectedColumns | 65 | return this._selectedColumns |
69 | } | 66 | } |
@@ -73,9 +70,8 @@ export class UserListComponent extends RestTable implements OnInit { | |||
73 | } | 70 | } |
74 | 71 | ||
75 | ngOnInit () { | 72 | ngOnInit () { |
76 | this.serverConfig = this.serverService.getTmpConfig() | ||
77 | this.serverService.getConfig() | 73 | this.serverService.getConfig() |
78 | .subscribe(config => this.serverConfig = config) | 74 | .subscribe(config => this.requiresEmailVerification = config.signup.requiresEmailVerification) |
79 | 75 | ||
80 | this.initialize() | 76 | this.initialize() |
81 | 77 | ||