innocuous-symmetry/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only disable a device if all associated config entries are disabled (#53681)

Browse Source
This commit is contained in:
Robert Svensson
2021-07-29 21:08:53 +02:00
committed by GitHub
parent 204426009f
commit c6213b36ad
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/helpers/device_registry.py
View File

@@ -670,6 +670,7 @@ def async_config_entry_disabled_by_changed(
the config entry is disabled, enable devices in the registry that are associated
with a config entry when the config entry is enabled and the devices are marked
DISABLED_CONFIG_ENTRY.
Only disable a device if all associated config entries are disabled.
"""
devices = async_entries_for_config_entry(registry, config_entry.entry_id)
@@ -681,10 +682,20 @@ def async_config_entry_disabled_by_changed(
registry.async_update_device(device.id, disabled_by=None)
return
enabled_config_entries = {
entry.entry_id
for entry in registry.hass.config_entries.async_entries()
if not entry.disabled_by
}
for device in devices:
if device.disabled:
# Device already disabled, do not overwrite
continue
if len(device.config_entries) > 1 and device.config_entries.intersection(
enabled_config_entries
):
continue
registry.async_update_device(device.id, disabled_by=DISABLED_CONFIG_ENTRY)