Skip to content

Zone - Hass configuration name is optional #14449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 5 commits into from
Jun 7, 2018
Merged

Zone - Hass configuration name is optional #14449

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8d54f5
Hass configuration name is optional
Kane610 May 13, 2018
2afd377
Check explicitly if name is none
Kane610 May 13, 2018
216de72
Reverted back to old logic for zones configured in configuration.yaml…
Kane610 May 30, 2018
e13b9f7
New test to verify use case of allowing multiple zones having the sam…
Kane610 May 30, 2018
86c8bcc
Fix too long line
Kane610 May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion homeassistant/components/zone/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@ async def async_setup(hass, config):
zone.entity_id = async_generate_entity_id(
ENTITY_ID_FORMAT, entry[CONF_NAME], None, hass)
hass.async_add_job(zone.async_update_ha_state())
hass.data[DOMAIN][name] = zone
hass.data[DOMAIN][slugify(name)] = zone

if HOME_ZONE not in hass.data[DOMAIN] and HOME_ZONE not in zone_entries:
name = hass.config.location_name
if name is None:

@syssi syssi May 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible apply a proper default to location_name?

@Kane610 Kane610 May 21, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is hass own parameter. This is how the old logic worked. I just missed this use case

name = HOME_ZONE
zone = Zone(hass, name, hass.config.latitude, hass.config.longitude,
DEFAULT_RADIUS, ICON_HOME, False)
zone.entity_id = ENTITY_ID_HOME
Expand Down