Browse Source
Merge pull request #10999 from vvlladd28/bug/entity-table-header/autocomplete-create-new
Fixed entity table header components disabled create new device/asset profile
pull/11124/head
Igor Kulikov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
3 additions and
2 deletions
-
ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html
-
ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
-
ui-ngx/src/app/modules/home/pages/asset/asset-table-header.component.html
|
|
@ -54,7 +54,8 @@ |
|
|
formControlName="deviceProfileId" |
|
|
formControlName="deviceProfileId" |
|
|
[displayAllOnEmpty]="true" |
|
|
[displayAllOnEmpty]="true" |
|
|
(deviceProfileChanged)="deviceProfileChanged($event)" |
|
|
(deviceProfileChanged)="deviceProfileChanged($event)" |
|
|
[editProfileEnabled]="false"> |
|
|
[editProfileEnabled]="false" |
|
|
|
|
|
[addNewProfile]="false"> |
|
|
</tb-device-profile-autocomplete> |
|
|
</tb-device-profile-autocomplete> |
|
|
<mat-form-field> |
|
|
<mat-form-field> |
|
|
<mat-label translate>device.device-state</mat-label> |
|
|
<mat-label translate>device.device-state</mat-label> |
|
|
|
|
|
@ -60,7 +60,6 @@ |
|
|
<tb-device-profile-autocomplete |
|
|
<tb-device-profile-autocomplete |
|
|
required |
|
|
required |
|
|
addNewProfile |
|
|
addNewProfile |
|
|
showCreateNewButton |
|
|
|
|
|
selectDefaultProfile |
|
|
selectDefaultProfile |
|
|
formControlName="deviceProfileId" |
|
|
formControlName="deviceProfileId" |
|
|
(deviceProfileChanged)="deviceProfileChanged($event)"> |
|
|
(deviceProfileChanged)="deviceProfileChanged($event)"> |
|
|
|
|
|
@ -19,6 +19,7 @@ |
|
|
subscriptSizing="dynamic" |
|
|
subscriptSizing="dynamic" |
|
|
[ngModel]="entitiesTableConfig.componentsData.assetProfileId" |
|
|
[ngModel]="entitiesTableConfig.componentsData.assetProfileId" |
|
|
(ngModelChange)="assetProfileChanged($event)" |
|
|
(ngModelChange)="assetProfileChanged($event)" |
|
|
|
|
|
[addNewProfile]="false" |
|
|
[displayAllOnEmpty]="true" |
|
|
[displayAllOnEmpty]="true" |
|
|
[editProfileEnabled]="false"> |
|
|
[editProfileEnabled]="false"> |
|
|
</tb-asset-profile-autocomplete> |
|
|
</tb-asset-profile-autocomplete> |
|
|
|