From 005cfbb7e9d70d8a679ba6ffc49e3126412064e8 Mon Sep 17 00:00:00 2001 From: JarbasAi Date: Sat, 27 Jan 2024 16:33:10 +0000 Subject: [PATCH] fix/remove_pages --- ovos_gui/namespace.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ovos_gui/namespace.py b/ovos_gui/namespace.py index 3cde48f..ab485c2 100644 --- a/ovos_gui/namespace.py +++ b/ovos_gui/namespace.py @@ -613,7 +613,7 @@ def handle_delete_page(self, message: Message): message_is_valid = _validate_page_message(message) if message_is_valid: namespace_name = message.data["__from"] - pages_to_remove = message.data["page"] + pages_to_remove = message.data["page_names"] with namespace_lock: self._remove_pages(namespace_name, pages_to_remove) @@ -627,8 +627,8 @@ def _remove_pages(self, namespace_name: str, pages_to_remove: List[str]): namespace = self.loaded_namespaces.get(namespace_name) if namespace is not None and namespace in self.active_namespaces: page_positions = [] - for index, page in enumerate(pages_to_remove): - if page == namespace.pages[index].id: + for index, page in enumerate(namespace.pages): + if page.name in pages_to_remove: page_positions.append(index) page_positions.sort(reverse=True) @@ -981,6 +981,7 @@ def handle_namespace_global_back(self, message: Optional[Message]): Handles global back events from the GUI. @param message: the event sent by the GUI """ + # TODO - unused ? missing bus event ? namespace_name = self.active_namespaces[0].skill_id namespace = self.loaded_namespaces.get(namespace_name) if namespace in self.active_namespaces: