From 20743c300699f01e67e2fdbbe73383f43c5e0a69 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 5 Mar 2023 20:07:21 +0100 Subject: [PATCH 1/2] fixes #795 --- apps/nspanel-lovelace-ui/luibackend/config.py | 8 ++++++-- apps/nspanel-lovelace-ui/luibackend/pages.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py index a89e7477..010d1fff 100644 --- a/apps/nspanel-lovelace-ui/luibackend/config.py +++ b/apps/nspanel-lovelace-ui/luibackend/config.py @@ -38,8 +38,12 @@ class Card(object): self.cardType = card_input_config.get("type", "unknown") self.title = card_input_config.get("title", "unknown") self.key = card_input_config.get("key", "unknown") - self.nav1Override = card_input_config.get("navItem1") - self.nav2Override = card_input_config.get("navItem2") + self.nav1Override = None + if card_input_config.get("navItem1"): + self.nav1Override = Entity(card_input_config.get("navItem1")) + self.nav2Override = None + if card_input_config.get("navItem2"): + self.nav2Override = Entity(card_input_config.get("navItem2")) self.sleepTimeout = card_input_config.get("sleepTimeout") self.last_update = 0 self.cooldown = card_input_config.get("cooldown", 0) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 3e03063e..98a04c39 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -695,10 +695,10 @@ class LuiPagesGen(object): rightBtn = "delete~~~~~" if card.nav1Override is not None: - leftBtn = self.generate_entities_item(Entity(card.nav1Override))[1:] + leftBtn = self.generate_entities_item(card.nav1Override)[1:] if card.nav2Override is not None: - rightBtn = self.generate_entities_item(Entity(card.nav2Override))[1:] + rightBtn = self.generate_entities_item(card.nav2Override)[1:] navigation = f"{leftBtn}~{rightBtn}" From 70211d563fce0aa0df463c44c8ee3b3804e0d666 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 5 Mar 2023 20:21:02 +0100 Subject: [PATCH 2/2] fixes #798 --- apps/nspanel-lovelace-ui/luibackend/pages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 98a04c39..a9c11430 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -492,7 +492,7 @@ class LuiPagesGen(object): state_translation = get_translation(self._locale, "frontend.ui.panel.config.devices.entities.state") action_translation = get_translation(self._locale, "frontend.ui.card.climate.operation").replace(' ','\r\n') - detailPage = "" + detailPage = "1" if any(x in ["preset_modes", "swing_modes", "fan_modes"] for x in entity.attributes): detailPage = "0"