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

Use already configured key in harmony and mikrotik (#41142)

Browse Source
This commit is contained in:
springstan 2020-10-03 18:17:24 +02:00 committed by GitHub
parent 5721225dde
commit f919646519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/harmony/config_flow.py
View File

@ -87,7 +87,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
friendly_name = discovery_info[ssdp.ATTR_UPNP_FRIENDLY_NAME] friendly_name = discovery_info[ssdp.ATTR_UPNP_FRIENDLY_NAME]
if self._host_already_configured(parsed_url.hostname): if self._host_already_configured(parsed_url.hostname):
return self.async_abort(reason="already_configured_device") return self.async_abort(reason="already_configured")
# pylint: disable=no-member # pylint: disable=no-member
self.context["title_placeholders"] = {"name": friendly_name} self.context["title_placeholders"] = {"name": friendly_name}

2
homeassistant/components/harmony/strings.json
View File

@ -19,7 +19,7 @@
"unknown": "[%key:common::config_flow::error::unknown%]" "unknown": "[%key:common::config_flow::error::unknown%]"
}, },
"abort": { "abort": {
"already_configured_device": "[%key:common::config_flow::abort::already_configured_device%]" "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
} }
}, },
"options": { "options": {

2
homeassistant/components/mikrotik/config_flow.py
View File

@ -43,7 +43,7 @@ class MikrotikFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
if user_input is not None: if user_input is not None:
for entry in self.hass.config_entries.async_entries(DOMAIN): for entry in self.hass.config_entries.async_entries(DOMAIN):
if entry.data[CONF_HOST] == user_input[CONF_HOST]: if entry.data[CONF_HOST] == user_input[CONF_HOST]:
return self.async_abort(reason="already_configured_device") return self.async_abort(reason="already_configured")
if entry.data[CONF_NAME] == user_input[CONF_NAME]: if entry.data[CONF_NAME] == user_input[CONF_NAME]:
errors[CONF_NAME] = "name_exists" errors[CONF_NAME] = "name_exists"
break break

2
homeassistant/components/mikrotik/strings.json
View File

@ -19,7 +19,7 @@
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]" "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
}, },
"abort": { "abort": {
"already_configured_device": "[%key:common::config_flow::abort::already_configured_device%]" "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
} }
}, },
"options": { "options": {

2
tests/components/mikrotik/test_config_flow.py
View File

@ -156,7 +156,7 @@ async def test_host_already_configured(hass, auth_error):
result["flow_id"], user_input=DEMO_USER_INPUT result["flow_id"], user_input=DEMO_USER_INPUT
) )
assert result["type"] == "abort" assert result["type"] == "abort"
assert result["reason"] == "already_configured_device" assert result["reason"] == "already_configured"
async def test_name_exists(hass, api): async def test_name_exists(hass, api):