jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-05-30 10:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZHA regressions caused by "Support async validation of device trigger" (#27401)

Browse Source 
* Revert "Support async validation of device trigger (#27333)"

This reverts commit fdf4f398a79e775e11dc9fdd391a8b53f7b773c5.

* Revert only ZHA changes

* Fix whitespace

* Restore ZHA changes but add check to make sure ZHA is loaded

* Address review comment

* Remove additional check
This commit is contained in:
Erik Montnemery 2019-10-14 20:11:43 +02:00 committed by David F. Mulcahey
parent 2295b33204
commit c7bd0fe909
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/zha/device_trigger.py
View File

@ -25,14 +25,14 @@ async def async_validate_trigger_config(hass, config):
"""Validate config."""
config = TRIGGER_SCHEMA(config)
trigger = (config[CONF_TYPE], config[CONF_SUBTYPE])
zha_device = await async_get_zha_device(hass, config[CONF_DEVICE_ID])
if (
zha_device.device_automation_triggers is None
or trigger not in zha_device.device_automation_triggers
):
raise InvalidDeviceAutomationConfig
if "zha" in hass.config.components:
trigger = (config[CONF_TYPE], config[CONF_SUBTYPE])
zha_device = await async_get_zha_device(hass, config[CONF_DEVICE_ID])
if (
zha_device.device_automation_triggers is None
or trigger not in zha_device.device_automation_triggers
):
raise InvalidDeviceAutomationConfig
return config