aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+accounts/accounts.component.html2
-rw-r--r--client/src/app/+accounts/accounts.component.ts2
-rw-r--r--client/src/app/shared/shared-moderation/report-modals/account-report.component.ts13
3 files changed, 9 insertions, 8 deletions
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 245edfd58..0bb24de2e 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -85,5 +85,5 @@
85</div> 85</div>
86 86
87<ng-container *ngIf="prependModerationActions"> 87<ng-container *ngIf="prependModerationActions">
88 <my-account-report #accountReportModal [account]="account"></my-account-report> 88 <my-account-report #accountReportModal></my-account-report>
89</ng-container> 89</ng-container>
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 3cb117fcc..0dcbc250a 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -162,7 +162,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
162 } 162 }
163 163
164 private showReportModal () { 164 private showReportModal () {
165 this.accountReportModal.show() 165 this.accountReportModal.show(this.account)
166 } 166 }
167 167
168 private loadUserIfNeeded (account: Account) { 168 private loadUserIfNeeded (account: Account) {
diff --git a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
index 4ec02f11a..78c9b3382 100644
--- a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
+++ b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
@@ -1,5 +1,5 @@
1import { mapValues, pickBy } from 'lodash-es' 1import { mapValues, pickBy } from 'lodash-es'
2import { Component, Input, OnInit, ViewChild } from '@angular/core' 2import { Component, OnInit, ViewChild } from '@angular/core'
3import { Notifier } from '@app/core' 3import { Notifier } from '@app/core'
4import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators' 4import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators'
5import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' 5import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
@@ -16,13 +16,12 @@ import { AbuseService } from '../abuse.service'
16 styleUrls: [ './report.component.scss' ] 16 styleUrls: [ './report.component.scss' ]
17}) 17})
18export class AccountReportComponent extends FormReactive implements OnInit { 18export class AccountReportComponent extends FormReactive implements OnInit {
19 @Input() account: Account = null
20
21 @ViewChild('modal', { static: true }) modal: NgbModal 19 @ViewChild('modal', { static: true }) modal: NgbModal
22 20
23 error: string = null 21 error: string = null
24 predefinedReasons: { id: AbusePredefinedReasonsString, label: string, description?: string, help?: string }[] = [] 22 predefinedReasons: { id: AbusePredefinedReasonsString, label: string, description?: string, help?: string }[] = []
25 modalTitle: string 23 modalTitle: string
24 account: Account = null
26 25
27 private openedModal: NgbModalRef 26 private openedModal: NgbModalRef
28 27
@@ -48,8 +47,6 @@ export class AccountReportComponent extends FormReactive implements OnInit {
48 } 47 }
49 48
50 ngOnInit () { 49 ngOnInit () {
51 this.modalTitle = $localize`Report ${this.account.displayName}`
52
53 this.buildForm({ 50 this.buildForm({
54 reason: ABUSE_REASON_VALIDATOR, 51 reason: ABUSE_REASON_VALIDATOR,
55 predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null) 52 predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null)
@@ -58,7 +55,11 @@ export class AccountReportComponent extends FormReactive implements OnInit {
58 this.predefinedReasons = this.abuseService.getPrefefinedReasons('account') 55 this.predefinedReasons = this.abuseService.getPrefefinedReasons('account')
59 } 56 }
60 57
61 show () { 58 show (account: Account) {
59 this.account = account
60
61 this.modalTitle = $localize`Report ${this.account.displayName}`
62
62 this.openedModal = this.modalService.open(this.modal, { centered: true, keyboard: false, size: 'lg' }) 63 this.openedModal = this.modalService.open(this.modal, { centered: true, keyboard: false, size: 'lg' })
63 } 64 }
64 65