mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-26 02:36:37 +00:00
Keep area field next to use device area field (#16324)
This commit is contained in:
parent
8cf8c41698
commit
5cd3ce66f6
@ -608,11 +608,10 @@ export class EntityRegistrySettingsEditor extends LitElement {
|
|||||||
.disabled=${this.disabled}
|
.disabled=${this.disabled}
|
||||||
@input=${this._entityIdChanged}
|
@input=${this._entityIdChanged}
|
||||||
></ha-textfield>
|
></ha-textfield>
|
||||||
${!this.entry.device_id || this._areaId || this._noDeviceArea
|
${!this.entry.device_id
|
||||||
? html`<ha-area-picker
|
? html`<ha-area-picker
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
.value=${this._areaId}
|
.value=${this._areaId}
|
||||||
.placeholder=${this._device?.area_id}
|
|
||||||
.disabled=${this.disabled}
|
.disabled=${this.disabled}
|
||||||
@value-changed=${this._areaPicked}
|
@value-changed=${this._areaPicked}
|
||||||
></ha-area-picker>`
|
></ha-area-picker>`
|
||||||
@ -827,7 +826,16 @@ export class EntityRegistrySettingsEditor extends LitElement {
|
|||||||
@change=${this._useDeviceAreaChanged}
|
@change=${this._useDeviceAreaChanged}
|
||||||
>
|
>
|
||||||
</ha-switch
|
</ha-switch
|
||||||
></ha-settings-row>`
|
></ha-settings-row>
|
||||||
|
${this._areaId || this._noDeviceArea
|
||||||
|
? html`<ha-area-picker
|
||||||
|
.hass=${this.hass}
|
||||||
|
.value=${this._areaId}
|
||||||
|
.placeholder=${this._device?.area_id}
|
||||||
|
.disabled=${this.disabled}
|
||||||
|
@value-changed=${this._areaPicked}
|
||||||
|
></ha-area-picker>`
|
||||||
|
: ""} `
|
||||||
: ""}
|
: ""}
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user