diff options
author | Chocobozzz <me@florianbigard.com> | 2021-08-17 14:42:53 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-08-18 08:35:06 +0200 |
commit | 9df52d660feb722404be00a50f3c8a612bec1c15 (patch) | |
tree | dde52880fa012874d24c60f64eb596b0a789cc8b /client/src/app/+admin | |
parent | adb8809d43648ea0a64d6845bb39aa3bd0e005a6 (diff) | |
download | PeerTube-9df52d660feb722404be00a50f3c8a612bec1c15.tar.gz PeerTube-9df52d660feb722404be00a50f3c8a612bec1c15.tar.zst PeerTube-9df52d660feb722404be00a50f3c8a612bec1c15.zip |
Migrate client to eslint
Diffstat (limited to 'client/src/app/+admin')
19 files changed, 48 insertions, 39 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts index 671e734ac..7a8258820 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts | |||
@@ -97,7 +97,7 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges { | |||
97 | .pipe(pairwise()) | 97 | .pipe(pairwise()) |
98 | .subscribe(([ oldValue, newValue ]) => { | 98 | .subscribe(([ oldValue, newValue ]) => { |
99 | if (oldValue !== true && newValue === true) { | 99 | if (oldValue !== true && newValue === true) { |
100 | // tslint:disable:max-line-length | 100 | /* eslint-disable max-len */ |
101 | this.signupAlertMessage = $localize`You enabled signup: we automatically enabled the "Block new videos automatically" checkbox of the "Videos" section just below.` | 101 | this.signupAlertMessage = $localize`You enabled signup: we automatically enabled the "Block new videos automatically" checkbox of the "Videos" section just below.` |
102 | 102 | ||
103 | this.form.patchValue({ | 103 | this.form.patchValue({ |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index 538fa6f14..be1a99289 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -277,7 +277,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
277 | 277 | ||
278 | // Reload general configuration | 278 | // Reload general configuration |
279 | this.serverService.resetConfig() | 279 | this.serverService.resetConfig() |
280 | .subscribe(config => this.serverConfig = config) | 280 | .subscribe(config => { |
281 | this.serverConfig = config | ||
282 | }) | ||
281 | 283 | ||
282 | this.updateForm() | 284 | this.updateForm() |
283 | 285 | ||
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts index 1923ede39..dc834da14 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Component, Input, OnInit } from '@angular/core' | 1 | import { Component, Input } from '@angular/core' |
2 | import { FormGroup } from '@angular/forms' | 2 | import { FormGroup } from '@angular/forms' |
3 | import { CustomMarkupService } from '@app/shared/shared-custom-markup' | 3 | import { CustomMarkupService } from '@app/shared/shared-custom-markup' |
4 | 4 | ||
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index cf0225098..383f66ffd 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts | |||
@@ -2,7 +2,6 @@ import { SortMeta } from 'primeng/api' | |||
2 | import { Component, OnInit, ViewChild } from '@angular/core' | 2 | import { Component, OnInit, ViewChild } from '@angular/core' |
3 | import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' | 3 | import { ConfirmService, Notifier, RestPagination, RestTable } from '@app/core' |
4 | import { InstanceFollowService } from '@app/shared/shared-instance' | 4 | import { InstanceFollowService } from '@app/shared/shared-instance' |
5 | import { BatchDomainsModalComponent } from '@app/shared/shared-moderation' | ||
6 | import { ActorFollow } from '@shared/models' | 5 | import { ActorFollow } from '@shared/models' |
7 | import { FollowModalComponent } from './follow-modal.component' | 6 | import { FollowModalComponent } from './follow-modal.component' |
8 | 7 | ||
@@ -22,7 +21,7 @@ export class FollowingListComponent extends RestTable implements OnInit { | |||
22 | private notifier: Notifier, | 21 | private notifier: Notifier, |
23 | private confirmService: ConfirmService, | 22 | private confirmService: ConfirmService, |
24 | private followService: InstanceFollowService | 23 | private followService: InstanceFollowService |
25 | ) { | 24 | ) { |
26 | super() | 25 | super() |
27 | } | 26 | } |
28 | 27 | ||
diff --git a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts index 47c402510..95f8473db 100644 --- a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts +++ b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts | |||
@@ -14,7 +14,7 @@ export class RedundancyCheckboxComponent { | |||
14 | constructor ( | 14 | constructor ( |
15 | private notifier: Notifier, | 15 | private notifier: Notifier, |
16 | private redundancyService: RedundancyService | 16 | private redundancyService: RedundancyService |
17 | ) { } | 17 | ) { } |
18 | 18 | ||
19 | updateRedundancyState () { | 19 | updateRedundancyState () { |
20 | this.redundancyService.updateRedundancy(this.host, this.redundancyAllowed) | 20 | this.redundancyService.updateRedundancy(this.host, this.redundancyAllowed) |
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts index 4c691269a..7ffed83e8 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts | |||
@@ -21,7 +21,7 @@ export class VideoRedundanciesListComponent extends RestTable implements OnInit | |||
21 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } | 21 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } |
22 | displayType: VideoRedundanciesTarget = 'my-videos' | 22 | displayType: VideoRedundanciesTarget = 'my-videos' |
23 | 23 | ||
24 | redundanciesGraphsData: { stats: VideosRedundancyStats, graphData: object, options: object }[] = [] | 24 | redundanciesGraphsData: { stats: VideosRedundancyStats, graphData: any, options: any }[] = [] |
25 | 25 | ||
26 | noRedundancies = false | 26 | noRedundancies = false |
27 | 27 | ||
@@ -32,7 +32,7 @@ export class VideoRedundanciesListComponent extends RestTable implements OnInit | |||
32 | private confirmService: ConfirmService, | 32 | private confirmService: ConfirmService, |
33 | private redundancyService: RedundancyService, | 33 | private redundancyService: RedundancyService, |
34 | private serverService: ServerService | 34 | private serverService: ServerService |
35 | ) { | 35 | ) { |
36 | super() | 36 | super() |
37 | 37 | ||
38 | this.bytesPipe = new BytesPipe() | 38 | this.bytesPipe = new BytesPipe() |
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html index d89c8f244..3a8df1f07 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | <ng-template pTemplate="header"> | 22 | <ng-template pTemplate="header"> |
23 | <tr> | 23 | <tr> |
24 | <th style="width: 40px"></th> | 24 | <th style="width: 40px;"></th> |
25 | <th style="width: 150px;"></th> | 25 | <th style="width: 150px;"></th> |
26 | <th i18n pSortableColumn="name">Video <p-sortIcon field="name"></p-sortIcon></th> | 26 | <th i18n pSortableColumn="name">Video <p-sortIcon field="name"></p-sortIcon></th> |
27 | <th style="width: 100px;" i18n>Sensitive</th> | 27 | <th style="width: 100px;" i18n>Sensitive</th> |
@@ -54,7 +54,7 @@ | |||
54 | </div> | 54 | </div> |
55 | <div class="table-video-text"> | 55 | <div class="table-video-text"> |
56 | <div> | 56 | <div> |
57 | <my-global-icon i18n-title title="The video was blocked due to automatic blocking of new videos" *ngIf="videoBlock.type == 2" iconName="robot"></my-global-icon> | 57 | <my-global-icon i18n-title title="The video was blocked due to automatic blocking of new videos" *ngIf="videoBlock.type === 2" iconName="robot"></my-global-icon> |
58 | {{ videoBlock.video.name }} | 58 | {{ videoBlock.video.name }} |
59 | </div> | 59 | </div> |
60 | <div class="text-muted">by {{ videoBlock.video.channel?.displayName }} on {{ videoBlock.video.channel?.host }} </div> | 60 | <div class="text-muted">by {{ videoBlock.video.channel?.displayName }} on {{ videoBlock.video.channel?.host }} </div> |
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts index adef16975..3edcb1c63 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts | |||
@@ -28,11 +28,11 @@ export class VideoBlockListComponent extends RestTable implements OnInit { | |||
28 | 28 | ||
29 | inputFilters: AdvancedInputFilter[] = [ | 29 | inputFilters: AdvancedInputFilter[] = [ |
30 | { | 30 | { |
31 | queryParams: { 'search': 'type:auto' }, | 31 | queryParams: { search: 'type:auto' }, |
32 | label: $localize`Automatic blocks` | 32 | label: $localize`Automatic blocks` |
33 | }, | 33 | }, |
34 | { | 34 | { |
35 | queryParams: { 'search': 'type:manual' }, | 35 | queryParams: { search: 'type:manual' }, |
36 | label: $localize`Manual blocks` | 36 | label: $localize`Manual blocks` |
37 | } | 37 | } |
38 | ] | 38 | ] |
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts index 4904bcc25..512ceffd9 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts | |||
@@ -44,11 +44,11 @@ export class VideoCommentListComponent extends RestTable implements OnInit { | |||
44 | 44 | ||
45 | inputFilters: AdvancedInputFilter[] = [ | 45 | inputFilters: AdvancedInputFilter[] = [ |
46 | { | 46 | { |
47 | queryParams: { 'search': 'local:true' }, | 47 | queryParams: { search: 'local:true' }, |
48 | label: $localize`Local comments` | 48 | label: $localize`Local comments` |
49 | }, | 49 | }, |
50 | { | 50 | { |
51 | queryParams: { 'search': 'local:false' }, | 51 | queryParams: { search: 'local:false' }, |
52 | label: $localize`Remote comments` | 52 | label: $localize`Remote comments` |
53 | } | 53 | } |
54 | ] | 54 | ] |
@@ -66,7 +66,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit { | |||
66 | private videoCommentService: VideoCommentService, | 66 | private videoCommentService: VideoCommentService, |
67 | private markdownRenderer: MarkdownService, | 67 | private markdownRenderer: MarkdownService, |
68 | private bulkService: BulkService | 68 | private bulkService: BulkService |
69 | ) { | 69 | ) { |
70 | super() | 70 | super() |
71 | 71 | ||
72 | this.videoCommentActions = [ | 72 | this.videoCommentActions = [ |
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html index 8d8f12c48..a41c7d700 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | </div> | 3 | </div> |
4 | 4 | ||
5 | <div class="search-bar"> | 5 | <div class="search-bar"> |
6 | <input type="text" (input)="onSearchChange($event)" i18n-placeholder placeholder="Search..." autofocus /> | 6 | <input type="text" (input)="onSearchChange($event)" i18n-placeholder placeholder="Search..." myAutofocus /> |
7 | </div> | 7 | </div> |
8 | 8 | ||
9 | <div class="alert alert-info" i18n *ngIf="pluginInstalled"> | 9 | <div class="alert alert-info" i18n *ngIf="pluginInstalled"> |
diff --git a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts index 10fb52911..402bef1ea 100644 --- a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts +++ b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts | |||
@@ -103,8 +103,8 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit | |||
103 | const settingsValues: any = {} | 103 | const settingsValues: any = {} |
104 | 104 | ||
105 | for (const setting of this.registeredSettings) { | 105 | for (const setting of this.registeredSettings) { |
106 | buildOptions[ setting.name ] = null | 106 | buildOptions[setting.name] = null |
107 | settingsValues[ setting.name ] = this.getSetting(setting.name) | 107 | settingsValues[setting.name] = this.getSetting(setting.name) |
108 | } | 108 | } |
109 | 109 | ||
110 | this.buildForm(buildOptions) | 110 | this.buildForm(buildOptions) |
@@ -117,7 +117,7 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit | |||
117 | private getSetting (name: string) { | 117 | private getSetting (name: string) { |
118 | const settings = this.plugin.settings | 118 | const settings = this.plugin.settings |
119 | 119 | ||
120 | if (settings && settings[name] !== undefined) return settings[name] | 120 | if (settings?.[name] !== undefined) return settings[name] |
121 | 121 | ||
122 | const registered = this.registeredSettings.find(r => r.name === name) | 122 | const registered = this.registeredSettings.find(r => r.name === name) |
123 | 123 | ||
diff --git a/client/src/app/+admin/plugins/shared/plugin-api.service.ts b/client/src/app/+admin/plugins/shared/plugin-api.service.ts index d91fccc09..c4f480cae 100644 --- a/client/src/app/+admin/plugins/shared/plugin-api.service.ts +++ b/client/src/app/+admin/plugins/shared/plugin-api.service.ts | |||
@@ -1,10 +1,8 @@ | |||
1 | import { Observable } from 'rxjs' | 1 | import { catchError } from 'rxjs/operators' |
2 | import { catchError, map, switchMap } from 'rxjs/operators' | ||
3 | import { HttpClient, HttpParams } from '@angular/common/http' | 2 | import { HttpClient, HttpParams } from '@angular/common/http' |
4 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
5 | import { ComponentPagination, RestExtractor, RestService } from '@app/core' | 4 | import { ComponentPagination, RestExtractor, RestService } from '@app/core' |
6 | import { PluginService } from '@app/core/plugins/plugin.service' | 5 | import { PluginService } from '@app/core/plugins/plugin.service' |
7 | import { peertubeTranslate } from '@shared/core-utils/i18n' | ||
8 | import { | 6 | import { |
9 | InstallOrUpdatePlugin, | 7 | InstallOrUpdatePlugin, |
10 | ManagePlugin, | 8 | ManagePlugin, |
diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts index 4b4a8914f..6c4a07469 100644 --- a/client/src/app/+admin/system/jobs/job.service.ts +++ b/client/src/app/+admin/system/jobs/job.service.ts | |||
@@ -20,9 +20,9 @@ export class JobService { | |||
20 | ) {} | 20 | ) {} |
21 | 21 | ||
22 | getJobs (options: { | 22 | getJobs (options: { |
23 | jobState?: JobStateClient, | 23 | jobState?: JobStateClient |
24 | jobType: JobTypeClient, | 24 | jobType: JobTypeClient |
25 | pagination: RestPagination, | 25 | pagination: RestPagination |
26 | sort: SortMeta | 26 | sort: SortMeta |
27 | }): Observable<ResultList<Job>> { | 27 | }): Observable<ResultList<Job>> { |
28 | const { jobState, jobType, pagination, sort } = options | 28 | const { jobState, jobType, pagination, sort } = options |
@@ -32,7 +32,7 @@ export class JobService { | |||
32 | 32 | ||
33 | if (jobType !== 'all') params = params.append('jobType', jobType) | 33 | if (jobType !== 'all') params = params.append('jobType', jobType) |
34 | 34 | ||
35 | return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + `/${jobState ? jobState : ''}`, { params }) | 35 | return this.authHttp.get<ResultList<Job>>(JobService.BASE_JOB_URL + `/${jobState || ''}`, { params }) |
36 | .pipe( | 36 | .pipe( |
37 | map(res => { | 37 | map(res => { |
38 | return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ]) | 38 | return this.restExtractor.convertResultListDateToHuman(res, [ 'createdAt', 'processedOn', 'finishedOn' ]) |
diff --git a/client/src/app/+admin/system/logs/logs.service.ts b/client/src/app/+admin/system/logs/logs.service.ts index 69439a179..0c222cad2 100644 --- a/client/src/app/+admin/system/logs/logs.service.ts +++ b/client/src/app/+admin/system/logs/logs.service.ts | |||
@@ -18,9 +18,9 @@ export class LogsService { | |||
18 | ) {} | 18 | ) {} |
19 | 19 | ||
20 | getLogs (options: { | 20 | getLogs (options: { |
21 | isAuditLog: boolean, | 21 | isAuditLog: boolean |
22 | startDate: string, | 22 | startDate: string |
23 | level?: LogLevel, | 23 | level?: LogLevel |
24 | endDate?: string | 24 | endDate?: string |
25 | }): Observable<any[]> { | 25 | }): Observable<any[]> { |
26 | const { isAuditLog, startDate } = options | 26 | const { isAuditLog, startDate } = options |
diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts index 8403db91a..b61b22fd0 100644 --- a/client/src/app/+admin/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/users/user-edit/user-create.component.ts | |||
@@ -33,7 +33,7 @@ export class UserCreateComponent extends UserEdit implements OnInit { | |||
33 | private router: Router, | 33 | private router: Router, |
34 | private notifier: Notifier, | 34 | private notifier: Notifier, |
35 | private userService: UserService | 35 | private userService: UserService |
36 | ) { | 36 | ) { |
37 | super() | 37 | super() |
38 | 38 | ||
39 | this.buildQuotaOptions() | 39 | this.buildQuotaOptions() |
@@ -78,7 +78,9 @@ export class UserCreateComponent extends UserEdit implements OnInit { | |||
78 | this.router.navigate([ '/admin/users/list' ]) | 78 | this.router.navigate([ '/admin/users/list' ]) |
79 | }, | 79 | }, |
80 | 80 | ||
81 | error: err => this.error = err.message | 81 | error: err => { |
82 | this.error = err.message | ||
83 | } | ||
82 | }) | 84 | }) |
83 | } | 85 | } |
84 | 86 | ||
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 ae1f79ba0..af5e674a7 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts | |||
@@ -7,7 +7,7 @@ import { HTMLServerConfig, UserAdminFlag, UserRole, VideoResolution } from '@sha | |||
7 | import { SelectOptionsItem } from '../../../../types/select-options-item.model' | 7 | import { SelectOptionsItem } from '../../../../types/select-options-item.model' |
8 | 8 | ||
9 | @Directive() | 9 | @Directive() |
10 | // tslint:disable-next-line: directive-class-suffix | 10 | // eslint-disable-next-line @angular-eslint/directive-class-suffix |
11 | export abstract class UserEdit extends FormReactive implements OnInit { | 11 | export abstract class UserEdit extends FormReactive implements OnInit { |
12 | videoQuotaOptions: SelectOptionsItem[] = [] | 12 | videoQuotaOptions: SelectOptionsItem[] = [] |
13 | videoQuotaDailyOptions: SelectOptionsItem[] = [] | 13 | videoQuotaDailyOptions: SelectOptionsItem[] = [] |
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.ts b/client/src/app/+admin/users/user-edit/user-password.component.ts index 7c42b9241..42bf20de1 100644 --- a/client/src/app/+admin/users/user-edit/user-password.component.ts +++ b/client/src/app/+admin/users/user-edit/user-password.component.ts | |||
@@ -20,7 +20,7 @@ export class UserPasswordComponent extends FormReactive implements OnInit { | |||
20 | protected formValidatorService: FormValidatorService, | 20 | protected formValidatorService: FormValidatorService, |
21 | private notifier: Notifier, | 21 | private notifier: Notifier, |
22 | private userService: UserService | 22 | private userService: UserService |
23 | ) { | 23 | ) { |
24 | super() | 24 | super() |
25 | } | 25 | } |
26 | 26 | ||
@@ -39,7 +39,9 @@ export class UserPasswordComponent extends FormReactive implements OnInit { | |||
39 | .subscribe({ | 39 | .subscribe({ |
40 | next: () => this.notifier.success($localize`Password changed for user ${this.username}.`), | 40 | next: () => this.notifier.success($localize`Password changed for user ${this.username}.`), |
41 | 41 | ||
42 | error: err => this.error = err.message | 42 | error: err => { |
43 | this.error = err.message | ||
44 | } | ||
43 | }) | 45 | }) |
44 | } | 46 | } |
45 | 47 | ||
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index 2128ba4fd..42599a17e 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts | |||
@@ -33,7 +33,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { | |||
33 | private router: Router, | 33 | private router: Router, |
34 | private notifier: Notifier, | 34 | private notifier: Notifier, |
35 | private userService: UserService | 35 | private userService: UserService |
36 | ) { | 36 | ) { |
37 | super() | 37 | super() |
38 | 38 | ||
39 | this.buildQuotaOptions() | 39 | this.buildQuotaOptions() |
@@ -63,7 +63,9 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { | |||
63 | .subscribe({ | 63 | .subscribe({ |
64 | next: user => this.onUserFetched(user), | 64 | next: user => this.onUserFetched(user), |
65 | 65 | ||
66 | error: err => this.error = err.message | 66 | error: err => { |
67 | this.error = err.message | ||
68 | } | ||
67 | }) | 69 | }) |
68 | }) | 70 | }) |
69 | } | 71 | } |
@@ -91,7 +93,9 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { | |||
91 | this.router.navigate([ '/admin/users/list' ]) | 93 | this.router.navigate([ '/admin/users/list' ]) |
92 | }, | 94 | }, |
93 | 95 | ||
94 | error: err => this.error = err.message | 96 | error: err => { |
97 | this.error = err.message | ||
98 | } | ||
95 | }) | 99 | }) |
96 | } | 100 | } |
97 | 101 | ||
@@ -114,7 +118,9 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { | |||
114 | this.notifier.success($localize`An email asking for password reset has been sent to ${this.user.username}.`) | 118 | this.notifier.success($localize`An email asking for password reset has been sent to ${this.user.username}.`) |
115 | }, | 119 | }, |
116 | 120 | ||
117 | error: err => this.error = err.message | 121 | error: err => { |
122 | this.error = err.message | ||
123 | } | ||
118 | }) | 124 | }) |
119 | } | 125 | } |
120 | 126 | ||
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 d4406549a..39caf5ed5 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 | |||
@@ -36,7 +36,7 @@ export class UserListComponent extends RestTable implements OnInit { | |||
36 | 36 | ||
37 | inputFilters: AdvancedInputFilter[] = [ | 37 | inputFilters: AdvancedInputFilter[] = [ |
38 | { | 38 | { |
39 | queryParams: { 'search': 'banned:true' }, | 39 | queryParams: { search: 'banned:true' }, |
40 | label: $localize`Banned users` | 40 | label: $localize`Banned users` |
41 | } | 41 | } |
42 | ] | 42 | ] |