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

Fix rule template action parameter generation

Browse Source
This commit is contained in:
Michael Zanetti 2018-12-17 22:49:20 +01:00
parent 99006aeaad
commit adea48a50a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nymea-app/ui/magic/DeviceRulesPage.qml
View File

@ -80,7 +80,7 @@ Page {
onAddRuleReply: { onAddRuleReply: {
d.editRulePage.busy = false; d.editRulePage.busy = false;
if (ruleError == "RuleErrorNoError") { if (ruleError == "RuleErrorNoError") {
pageStack.pop(); pageStack.pop(root);
} else { } else {
var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml")); var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml"));
var popup = errorDialog.createObject(root, {errorCode: ruleError }) var popup = errorDialog.createObject(root, {errorCode: ruleError })
@ -91,7 +91,7 @@ Page {
onEditRuleReply: { onEditRuleReply: {
d.editRulePage.busy = false; d.editRulePage.busy = false;
if (ruleError == "RuleErrorNoError") { if (ruleError == "RuleErrorNoError") {
pageStack.pop(); pageStack.pop(root);
} else { } else {
var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml")); var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml"));
var popup = errorDialog.createObject(root, {errorCode: ruleError }) var popup = errorDialog.createObject(root, {errorCode: ruleError })

8
nymea-app/ui/magic/NewThingMagicPage.qml
View File

@ -69,8 +69,8 @@ Page {
var ruleAction = rule.actions.createNewRuleAction(); var ruleAction = rule.actions.createNewRuleAction();
ruleAction.interfaceName = ruleActionTemplate.interfaceName; ruleAction.interfaceName = ruleActionTemplate.interfaceName;
ruleAction.interfaceAction = ruleActionTemplate.interfaceAction; ruleAction.interfaceAction = ruleActionTemplate.interfaceAction;
for (var j = 0; j < ruleActionTemplate.ruleActionParams.count; j++) { for (var j = 0; j < ruleActionTemplate.ruleActionParamTemplates.count; j++) {
var ruleActionParam = ruleActionTemplate.ruleActionParams.get(j) var ruleActionParam = ruleActionTemplate.ruleActionParamTemplates.get(j)
ruleAction.ruleActionParams.setRuleActionParamByName(ruleActionParam.paramName, ruleActionParam.value) ruleAction.ruleActionParams.setRuleActionParamByName(ruleActionParam.paramName, ruleActionParam.value)
} }
rule.actions.addRuleAction(ruleAction); rule.actions.addRuleAction(ruleAction);
@ -113,8 +113,8 @@ Page {
var ruleExitAction = rule.exitActions.createNewRuleAction(); var ruleExitAction = rule.exitActions.createNewRuleAction();
ruleExitAction.interfaceName = ruleExitActionTemplate.interfaceName; ruleExitAction.interfaceName = ruleExitActionTemplate.interfaceName;
ruleExitAction.interfaceAction = ruleExitActionTemplate.interfaceAction; ruleExitAction.interfaceAction = ruleExitActionTemplate.interfaceAction;
for (var j = 0; j < ruleExitActionTemplate.ruleActionParams.count; j++) { for (var j = 0; j < ruleExitActionTemplate.ruleActionParamTemplates.count; j++) {
var ruleActionParam = ruleExitActionTemplate.ruleActionParams.get(j) var ruleActionParam = ruleExitActionTemplate.ruleActionParamTemplates.get(j)
ruleExitAction.ruleActionParams.setRuleActionParam(ruleActionParam.paramName, ruleActionParam.value) ruleExitAction.ruleActionParams.setRuleActionParam(ruleActionParam.paramName, ruleActionParam.value)
} }
rule.exitActions.addRuleAction(ruleAction); rule.exitActions.addRuleAction(ruleAction);