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

Fix merge conflict resolution error in flux_led (#66775)

Browse Source
This commit is contained in:
J. Nick Koston 2022-02-17 20:14:08 -06:00 committed by GitHub
parent 8b557884b7
commit 736a1ca0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/flux_led/select.py
View File

@ -110,7 +110,7 @@ class FluxPowerStateSelect(FluxConfigAtStartSelect, SelectEntity):
) -> None: ) -> None:
"""Initialize the power state select.""" """Initialize the power state select."""
super().__init__(device, entry) super().__init__(device, entry)
self._attr_name = f"{entry.data[CONF_NAME]} Power Restored" self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} Power Restored"
base_unique_id = entry.unique_id or entry.entry_id base_unique_id = entry.unique_id or entry.entry_id
self._attr_unique_id = f"{base_unique_id}_power_restored" self._attr_unique_id = f"{base_unique_id}_power_restored"
self._async_set_current_option_from_device() self._async_set_current_option_from_device()
@ -237,7 +237,7 @@ class FluxWhiteChannelSelect(FluxConfigAtStartSelect):
) -> None: ) -> None:
"""Initialize the white channel select.""" """Initialize the white channel select."""
super().__init__(device, entry) super().__init__(device, entry)
self._attr_name = f"{entry.data[CONF_NAME]} White Channel" self._attr_name = f"{entry.data.get(CONF_NAME, entry.title)} White Channel"
base_unique_id = entry.unique_id or entry.entry_id base_unique_id = entry.unique_id or entry.entry_id
self._attr_unique_id = f"{base_unique_id}_white_channel" self._attr_unique_id = f"{base_unique_id}_white_channel"