ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.ts
View File

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

16
client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html
View File

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