From adea48a50a1d337c22e34b101275edb638c503ed Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 17 Dec 2018 22:49:20 +0100
Subject: [PATCH] Fix rule template action parameter generation

---
 nymea-app/ui/magic/DeviceRulesPage.qml   | 4 ++--
 nymea-app/ui/magic/NewThingMagicPage.qml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nymea-app/ui/magic/DeviceRulesPage.qml b/nymea-app/ui/magic/DeviceRulesPage.qml
index 3ad724a3..10410e4d 100644
--- a/nymea-app/ui/magic/DeviceRulesPage.qml
+++ b/nymea-app/ui/magic/DeviceRulesPage.qml
@@ -80,7 +80,7 @@ Page {
         onAddRuleReply: {
             d.editRulePage.busy = false;
             if (ruleError == "RuleErrorNoError") {
-                pageStack.pop();
+                pageStack.pop(root);
             } else {
                 var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml"));
                 var popup = errorDialog.createObject(root, {errorCode: ruleError })
@@ -91,7 +91,7 @@ Page {
         onEditRuleReply: {
             d.editRulePage.busy = false;
             if (ruleError == "RuleErrorNoError") {
-                pageStack.pop();
+                pageStack.pop(root);
             } else {
                 var errorDialog = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml"));
                 var popup = errorDialog.createObject(root, {errorCode: ruleError })
diff --git a/nymea-app/ui/magic/NewThingMagicPage.qml b/nymea-app/ui/magic/NewThingMagicPage.qml
index 1818b63f..ae0caa08 100644
--- a/nymea-app/ui/magic/NewThingMagicPage.qml
+++ b/nymea-app/ui/magic/NewThingMagicPage.qml
@@ -69,8 +69,8 @@ Page {
                 var ruleAction = rule.actions.createNewRuleAction();
                 ruleAction.interfaceName = ruleActionTemplate.interfaceName;
                 ruleAction.interfaceAction = ruleActionTemplate.interfaceAction;
-                for (var j = 0; j < ruleActionTemplate.ruleActionParams.count; j++) {
-                    var ruleActionParam = ruleActionTemplate.ruleActionParams.get(j)
+                for (var j = 0; j < ruleActionTemplate.ruleActionParamTemplates.count; j++) {
+                    var ruleActionParam = ruleActionTemplate.ruleActionParamTemplates.get(j)
                     ruleAction.ruleActionParams.setRuleActionParamByName(ruleActionParam.paramName, ruleActionParam.value)
                 }
                 rule.actions.addRuleAction(ruleAction);
@@ -113,8 +113,8 @@ Page {
                 var ruleExitAction = rule.exitActions.createNewRuleAction();
                 ruleExitAction.interfaceName = ruleExitActionTemplate.interfaceName;
                 ruleExitAction.interfaceAction = ruleExitActionTemplate.interfaceAction;
-                for (var j = 0; j < ruleExitActionTemplate.ruleActionParams.count; j++) {
-                    var ruleActionParam = ruleExitActionTemplate.ruleActionParams.get(j)
+                for (var j = 0; j < ruleExitActionTemplate.ruleActionParamTemplates.count; j++) {
+                    var ruleActionParam = ruleExitActionTemplate.ruleActionParamTemplates.get(j)
                     ruleExitAction.ruleActionParams.setRuleActionParam(ruleActionParam.paramName, ruleActionParam.value)
                 }
                 rule.exitActions.addRuleAction(ruleAction);