From e64f25caf2ca05872f99c75aec6b1061b628e4ba Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 2 Apr 2020 15:54:34 +0200 Subject: [PATCH] Fix the check for preventing to remove auto things --- nymea-app/ui/thingconfiguration/ConfigureThingPage.qml | 4 ++-- nymea-app/ui/thingconfiguration/EditThingsPage.qml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml index f5db5e1d..4809537f 100644 --- a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml +++ b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml @@ -59,12 +59,12 @@ Page { deviceMenu.addItem(menuEntryComponent.createObject(deviceMenu, {text: qsTr("Rename"), iconSource: "../images/edit.svg", functionName: "renameThing"})) // FIXME: This isn't entirely correct... we should have a way to know if a particular thing is in fact autocreated // This check might be wrong for thingClasses with multiple create methods... - if (!root.device.isChild || root.deviceClass.createMethods !== ["auto"]) { + if (!root.device.isChild || root.deviceClass.createMethods.indexOf("CreateMethodAuto") < 0) { deviceMenu.addItem(menuEntryComponent.createObject(deviceMenu, {text: qsTr("Delete"), iconSource: "../images/delete.svg", functionName: "deleteThing"})) } // FIXME: This isn't entirely correct... we should have a way to know if a particular thing is in fact autocreated // This check might be wrong for thingClasses with multiple create methods... - if (!root.device.isChild || root.deviceClass.createMethods !== ["auto"]) { + if (!root.device.isChild || root.deviceClass.createMethods.indexOf("CreateMethodAuto") < 0) { deviceMenu.addItem(menuEntryComponent.createObject(deviceMenu, {text: qsTr("Reconfigure"), iconSource: "../images/configure.svg", functionName: "reconfigureThing"})) } } diff --git a/nymea-app/ui/thingconfiguration/EditThingsPage.qml b/nymea-app/ui/thingconfiguration/EditThingsPage.qml index 0654650e..9ebf4a3f 100644 --- a/nymea-app/ui/thingconfiguration/EditThingsPage.qml +++ b/nymea-app/ui/thingconfiguration/EditThingsPage.qml @@ -106,10 +106,9 @@ Page { delegate: ThingDelegate { device: deviceProxy.getDevice(model.id) // FIXME: This isn't entirely correct... we should have a way to know if a particular thing is in fact autocreated - // This check might be wrong for thingClasses with multiple create methods... - canDelete: !device.isChild && device.deviceClass.createMethods === ["auto"] + // This check might be wrong for thingClasses with multiple create methods... + canDelete: !device.isChild || device.deviceClass.createMethods.indexOf("CreateMethodAuto") < 0 onClicked: { - print("clicked:", model.id) pageStack.push(Qt.resolvedUrl("ConfigureThingPage.qml"), {device: device}) } onDeleteClicked: {