ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #274: Allow removal of discovered child things

Browse Source
This commit is contained in:
Jenkins nymea 2020-04-05 14:43:23 +02:00
commit e64d293d2b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnymea-core/nymeacore.cpp
View File

@ -211,8 +211,8 @@ QPair<Thing::ThingError, QList<RuleId> > NymeaCore::removeConfiguredThing(const
} }
// Check if this is a child // Check if this is a child
if (!thing->parentId().isNull()) { if (!thing->parentId().isNull() && thing->autoCreated()) {
qCWarning(dcThingManager) << "Thing is a child of" << thing->parentId().toString() << ". Please remove the parent."; qCWarning(dcThingManager) << "Thing is an autocreated child of" << thing->parentId().toString() << ". Please remove the parent.";
return QPair<Thing::ThingError, QList<RuleId> > (Thing::ThingErrorThingIsChild, QList<RuleId>()); return QPair<Thing::ThingError, QList<RuleId> > (Thing::ThingErrorThingIsChild, QList<RuleId>());
} }
@ -307,8 +307,8 @@ Thing::ThingError NymeaCore::removeConfiguredThing(const ThingId &thingId, const
} }
// Check if this is a child // Check if this is a child
if (!thing->parentId().isNull()) { if (!thing->parentId().isNull() && thing->autoCreated()) {
qCWarning(dcThingManager) << "Thing is a child of" << thing->parentId().toString() << ". Please remove the parent."; qCWarning(dcThingManager) << "Thing is an autocreated child of" << thing->parentId().toString() << ". Please remove the parent.";
return Thing::ThingErrorThingIsChild; return Thing::ThingErrorThingIsChild;
} }