Browse Source

Merge branch 'improvement/device-profile/credentials' of https://github.com/vvlladd28/thingsboard into merge-issue-fix

pull/4672/head
Andrii Shvaika 5 years ago
parent
commit
52a9c44afb
  1. 1
      ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts
  2. 2
      ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
  3. 2
      ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
  4. 2
      ui-ngx/src/assets/locale/locale.constant-en_US.json
  5. 2
      ui-ngx/src/assets/locale/locale.constant-es_ES.json
  6. 2
      ui-ngx/src/assets/locale/locale.constant-ko_KR.json
  7. 2
      ui-ngx/src/assets/locale/locale.constant-sl_SI.json
  8. 2
      ui-ngx/src/assets/locale/locale.constant-zh_CN.json

1
ui-ngx/src/app/modules/home/components/device/device-credentials.component.ts

@ -148,6 +148,7 @@ export class DeviceCredentialsComponent implements ControlValueAccessor, OnInit,
} else { } else {
this.deviceCredentialsFormGroup.enable({emitEvent: false}); this.deviceCredentialsFormGroup.enable({emitEvent: false});
this.updateValidators(); this.updateValidators();
this.deviceCredentialsFormGroup.updateValueAndValidity();
} }
} }

2
ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html

@ -155,7 +155,7 @@
<mat-step [stepControl]="credentialsFormGroup" [optional]="true"> <mat-step [stepControl]="credentialsFormGroup" [optional]="true">
<ng-template matStepLabel>{{ 'device.credentials' | translate }}</ng-template> <ng-template matStepLabel>{{ 'device.credentials' | translate }}</ng-template>
<form [formGroup]="credentialsFormGroup" style="padding-bottom: 16px;"> <form [formGroup]="credentialsFormGroup" style="padding-bottom: 16px;">
<mat-checkbox style="padding-bottom: 16px;" formControlName="setCredential">{{ 'device.wizard.add-credential' | translate }}</mat-checkbox> <mat-checkbox style="padding-bottom: 16px;" formControlName="setCredential">{{ 'device.wizard.add-credentials' | translate }}</mat-checkbox>
<tb-device-credentials <tb-device-credentials
[fxShow]="credentialsFormGroup.get('setCredential').value" [fxShow]="credentialsFormGroup.get('setCredential').value"
formControlName="credential"> formControlName="credential">

2
ui-ngx/src/assets/locale/locale.constant-cs_CZ.json

@ -923,7 +923,7 @@
"existing-device-profile": "Vybrat existující profil zařízení", "existing-device-profile": "Vybrat existující profil zařízení",
"specific-configuration": "Specifická konfigurace", "specific-configuration": "Specifická konfigurace",
"customer-to-assign-device": "Přiřadit zařízení zákazníkovi", "customer-to-assign-device": "Přiřadit zařízení zákazníkovi",
"add-credential": "Přidat přístupový údaj" "add-credentials": "Přidat přístupový údaj"
} }
}, },
"device-profile": { "device-profile": {

2
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -1000,7 +1000,7 @@
"existing-device-profile": "Select existing device profile", "existing-device-profile": "Select existing device profile",
"specific-configuration": "Specific configuration", "specific-configuration": "Specific configuration",
"customer-to-assign-device": "Customer to assign the device", "customer-to-assign-device": "Customer to assign the device",
"add-credential": "Add credential" "add-credentials": "Add credentials"
}, },
"unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?", "unassign-devices-from-edge-title": "Are you sure you want to unassign { count, plural, 1 {1 device} other {# devices} }?",
"unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge." "unassign-devices-from-edge-text": "After the confirmation all selected devices will be unassigned and won't be accessible by the edge."

2
ui-ngx/src/assets/locale/locale.constant-es_ES.json

@ -947,7 +947,7 @@
"existing-device-profile": "Seleccionar un perfil existente", "existing-device-profile": "Seleccionar un perfil existente",
"specific-configuration": "Configuración específica", "specific-configuration": "Configuración específica",
"customer-to-assign-device": "Cliente al que asignar el dispositivo", "customer-to-assign-device": "Cliente al que asignar el dispositivo",
"add-credential": "Añadir credencial" "add-credentials": "Añadir credencial"
}, },
"assign-device-to-edge-text": "Seleccione los dispositivos para asignar al borde", "assign-device-to-edge-text": "Seleccione los dispositivos para asignar al borde",
"unassign-device-from-edge-title": "¿Está seguro de que desea desasignar el dispositivo '{{deviceName}}'?", "unassign-device-from-edge-title": "¿Está seguro de que desea desasignar el dispositivo '{{deviceName}}'?",

2
ui-ngx/src/assets/locale/locale.constant-ko_KR.json

@ -920,7 +920,7 @@
"existing-device-profile": "기존 장치 프로파일 선택", "existing-device-profile": "기존 장치 프로파일 선택",
"specific-configuration": "특수 설정", "specific-configuration": "특수 설정",
"customer-to-assign-device": "장치에 할당할 커스터머", "customer-to-assign-device": "장치에 할당할 커스터머",
"add-credential": "크리덴셜 추가" "add-credentials": "크리덴셜 추가"
} }
}, },
"device-profile": { "device-profile": {

2
ui-ngx/src/assets/locale/locale.constant-sl_SI.json

@ -920,7 +920,7 @@
"existing-device-profile": "Select existing device profile", "existing-device-profile": "Select existing device profile",
"specific-configuration": "Specific configuration", "specific-configuration": "Specific configuration",
"customer-to-assign-device": "Customer to assign the device", "customer-to-assign-device": "Customer to assign the device",
"add-credential": "Add credential" "add-credentials": "Add credentials"
} }
}, },
"device-profile": { "device-profile": {

2
ui-ngx/src/assets/locale/locale.constant-zh_CN.json

@ -1079,7 +1079,7 @@
"view-credentials": "查看凭据", "view-credentials": "查看凭据",
"view-devices": "查看设备", "view-devices": "查看设备",
"wizard": { "wizard": {
"add-credential": "添加凭据", "add-credentials": "添加凭据",
"customer-to-assign-device": "客户分配设备", "customer-to-assign-device": "客户分配设备",
"device-details": "设备详细信息", "device-details": "设备详细信息",
"device-wizard": "设备向导", "device-wizard": "设备向导",

Loading…
Cancel
Save