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

Merge pull request #5690 from tsiegleauq/search-value-single-val

Browse Source 
Fix non-multipl os-search-val-selector
This commit is contained in:
Emanuel Schütze 2020-11-11 20:54:36 +01:00 committed by GitHub
commit 34070843c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/components/search-value-selector/search-value-selector.component.html
View File

@ -6,7 +6,7 @@
(openedChange)="openSelect($event)" (openedChange)="openSelect($event)"
> >
<!-- Custom display of selected items --> <!-- Custom display of selected items -->
<mat-select-trigger> <mat-select-trigger *ngIf="multiple">
<ng-container *ngIf="selectedItems?.length"> <ng-container *ngIf="selectedItems?.length">
<span *ngFor="let item of selectedItems; let i = index"> <span *ngFor="let item of selectedItems; let i = index">
{{ item.getTitle() | translate }}<span *ngIf="i < selectedItems.length - 1">, </span> {{ item.getTitle() | translate }}<span *ngIf="i < selectedItems.length - 1">, </span>

11
client/src/app/shared/components/search-value-selector/search-value-selector.component.ts
View File

@ -124,9 +124,12 @@ export class SearchValueSelectorComponent extends BaseFormControlComponentDirect
} }
public get selectedItems(): Selectable[] { public get selectedItems(): Selectable[] {
return this.selectableItems && this.contentForm.value if (this.multiple && this.selectableItems?.length && this.contentForm.value) {
? this.selectableItems.filter(item => this.contentForm.value.includes(item.id)) return this.selectableItems.filter(item => {
: []; return this.contentForm.value.includes(item.id);
});
}
return [];
} }
public controlType = 'search-value-selector'; public controlType = 'search-value-selector';
@ -197,7 +200,7 @@ export class SearchValueSelectorComponent extends BaseFormControlComponentDirect
} }
public onSelectionChange(change: MatOptionSelectionChange): void { public onSelectionChange(change: MatOptionSelectionChange): void {
if (change.isUserInput) { if (this.multiple && change.isUserInput) {
const value = change.source.value; const value = change.source.value;
this.addRemoveId(value); this.addRemoveId(value);
} }