ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #256: Cleanup Rule definition in introspection

pull/271/head
Jenkins nymea 2020-02-23 23:38:28 +01:00
parent ad3290460f ba6219bfd6
commit bfb14fe4ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/ruleengine/rule.h
View File

@ -44,9 +44,9 @@ namespace nymeaserver {
class Rule
{
Q_GADGET
Q_PROPERTY(QUuid id READ id WRITE setId USER true)
Q_PROPERTY(QUuid id READ id)
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(bool active READ active USER true)
Q_PROPERTY(bool active READ active)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled USER true)
Q_PROPERTY(bool executable READ executable WRITE setExecutable USER true)
Q_PROPERTY(EventDescriptors eventDescriptors READ eventDescriptors WRITE setEventDescriptors USER true)

4
tests/auto/api.json
View File

@ -2031,10 +2031,10 @@
"o:eventDescriptors": "$ref:EventDescriptors",
"o:executable": "Bool",
"o:exitActions": "$ref:RuleActions",
"o:id": "Uuid",
"o:stateEvaluator": "$ref:StateEvaluator",
"o:timeDescriptor": "$ref:TimeDescriptor",
"r:o:active": "Bool"
"r:active": "Bool",
"r:id": "Uuid"
},
"RuleAction": {
"o:actionTypeId": "Uuid",