From e5a11c1f7b65f80a855451c7216e7eb5367e10a8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 9 Jul 2018 15:12:41 +0200 Subject: [PATCH] Fix getContainerMetaDataEntry() CURA-5408 --- cura/Settings/ContainerManager.py | 12 ++++++------ resources/qml/SidebarHeader.qml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 859c0282ba..216637db21 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -47,18 +47,18 @@ class ContainerManager(QObject): self._container_name_filters = {} # type: Dict[str, Dict[str, Any]] @pyqtSlot(str, str, str, result=str) - def getContainerMetaDataEntry(self, container_id, entry_name, sub_entry: Optional = None): + def getContainerMetaDataEntry(self, container_id, entry_name, sub_entry: Optional[str] = None): metadatas = self._container_registry.findContainersMetadata(id = container_id) if not metadatas: Logger.log("w", "Could not get metadata of container %s because it was not found.", container_id) return "" - if sub_entry != "": - sub_data = metadatas[0].get(entry_name, "") - if sub_data: - return str(sub_data.get(sub_entry, "")) + sub_data = metadatas[0].get(entry_name, "") + result = str(sub_data) + if sub_entry: + result = str(sub_data.get(sub_entry, "")) - return str(metadatas[0].get(entry_name, "")) + return result ## Set a metadata entry of the specified container. # diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index cf199fd12b..0e5ac852e8 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -408,7 +408,7 @@ Column { return false; } - return Cura.ContainerManager.getContainerMetaDataEntry(activeExtruder.material.id, "compatible") == "True" + return Cura.ContainerManager.getContainerMetaDataEntry(activeExtruder.material.id, "compatible", "") == "True" } } }