Merge pull request #6075 from tsiegleauq/poo-dialog-cannot-enter

Enhance point-of-order dialog
This commit is contained in:
Emanuel Schütze 2021-05-25 21:40:50 +02:00 committed by GitHub
commit 66945231f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions

View File

@ -232,7 +232,8 @@ export class ListOfSpeakersContentComponent extends BaseViewComponentDirective i
PointOfOrderDialogComponent,
{
data: this.viewListOfSpeakers,
...infoDialogSettings
...infoDialogSettings,
disableClose: false
}
);

View File

@ -2,18 +2,18 @@
<span>{{ 'Are you sure you want to submit a point of order?' | translate }}</span>
</h2>
<mat-dialog-content>
{{ 'Request' | translate }}:
<form class="edit-form" [formGroup]="editForm">
<form class="edit-form" [formGroup]="editForm" (ngSubmit)="onOk()">
<mat-dialog-content>
{{ 'Request' | translate }}:
<mat-form-field>
<input matInput osAutofocus [maxLength]="MAX_LENGTH" formControlName="note" />
</mat-form-field>
</form>
{{ editForm.value.note.length }} / {{ MAX_LENGTH }}
</mat-dialog-content>
<mat-dialog-actions>
<button mat-button osAutofocus (click)="onOk()" color="accent" [disabled]="!this.editForm.valid">
{{ 'OK' | translate }}
</button>
<button mat-button (click)="onCancel()">{{ 'Cancel' | translate }}</button>
</mat-dialog-actions>
{{ editForm.value.note.length }} / {{ MAX_LENGTH }}
</mat-dialog-content>
<mat-dialog-actions>
<button type="submit" mat-button osAutofocus color="accent" [disabled]="!this.editForm.valid">
{{ 'OK' | translate }}
</button>
<button type="button" mat-button (click)="onCancel()">{{ 'Cancel' | translate }}</button>
</mat-dialog-actions>
</form>