diff --git a/src/app/admin/permission/permission-edit/permission-edit.component.html b/src/app/admin/permission/permission-edit/permission-edit.component.html index 35ce856a..0bfd6c18 100644 --- a/src/app/admin/permission/permission-edit/permission-edit.component.html +++ b/src/app/admin/permission/permission-edit/permission-edit.component.html @@ -69,7 +69,10 @@ [compareWith]="compare" #multiSelect > - + {{ getTextForUser(user) }} @@ -102,25 +105,28 @@
- -
- - - - {{ app.name }} - - -
+ +
+ + + + {{ app.name }} + + +
diff --git a/src/app/admin/users/new-kombit-user-page/new-user.component.html b/src/app/admin/users/new-kombit-user-page/new-user.component.html index 0b95f4c5..f2dedb82 100644 --- a/src/app/admin/users/new-kombit-user-page/new-user.component.html +++ b/src/app/admin/users/new-kombit-user-page/new-user.component.html @@ -50,7 +50,9 @@

panelClass="overflow-x-hidden" aria-required="true" > - + {{ org.name }} diff --git a/src/app/gateway/gateway-table/gateway-table.component.html b/src/app/gateway/gateway-table/gateway-table.component.html index 5e70d251..de9fac45 100644 --- a/src/app/gateway/gateway-table/gateway-table.component.html +++ b/src/app/gateway/gateway-table/gateway-table.component.html @@ -173,7 +173,7 @@ - + {{ "LORA-GATEWAY-TABLE.STATUS" | translate }} diff --git a/src/app/shared/components/forms/form-body-application/form-body-application.component.html b/src/app/shared/components/forms/form-body-application/form-body-application.component.html index 0bee122b..2ab42b43 100644 --- a/src/app/shared/components/forms/form-body-application/form-body-application.component.html +++ b/src/app/shared/components/forms/form-body-application/form-body-application.component.html @@ -54,7 +54,10 @@ [(value)]="application.permissionIds" [compareWith]="compare" > - + {{ permission.name }} diff --git a/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.html b/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.html index 8d616f9d..718061b7 100644 --- a/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.html +++ b/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.html @@ -10,14 +10,7 @@ (blur)="onBlur($event.target.value)" placeholder="placeholderLabel" /> -

diff --git a/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.ts b/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.ts index a5e068eb..c01af903 100644 --- a/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.ts +++ b/src/app/shared/components/mat-select-search/mat-select-search/mat-select-search.component.ts @@ -8,9 +8,11 @@ import { forwardRef, Inject, Input, + OnChanges, OnDestroy, OnInit, QueryList, + SimpleChanges, ViewChild, } from "@angular/core"; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms"; @@ -37,12 +39,13 @@ import { MatSelect } from "@angular/material/select"; * * @see https://github.com/angular/components/issues/5697#issuecomment-493628695 */ -export class MatSelectSearchComponent implements OnInit, OnDestroy, AfterViewInit, ControlValueAccessor { +export class MatSelectSearchComponent implements OnInit, OnDestroy, AfterViewInit, ControlValueAccessor, OnChanges { /** Label of the search placeholder */ @Input() placeholderLabel = "Søg efter ..."; /** Label to be shown when no entries are found. Set to null if no message should be shown. */ @Input() noEntriesFoundLabel = "Ingen elementer blev fundet"; + @Input() initialValues: any[]; /** Reference to the search input field */ @ViewChild("searchSelectInput", { static: false, read: ElementRef }) @@ -125,6 +128,12 @@ export class MatSelectSearchComponent implements OnInit, OnDestroy, AfterViewIni this.initMultipleHandling(); } + ngOnChanges(changes: SimpleChanges) { + if (changes.initialValues) { + this.previousSelectedValues = this.initialValues; + } + } + ngOnDestroy() { this._onDestroy.next(); this._onDestroy.complete();