From b5a0fcd6501eb06e78acab7031d2382e92e08424 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 18 Jul 2019 17:24:26 +0200
Subject: [PATCH] Fix item selection for rules in nested browser subpages

---
 nymea-app/ui/magic/SelectBrowserItemActionPage.qml | 7 ++++---
 nymea-app/ui/magic/SelectRuleActionPage.qml        | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nymea-app/ui/magic/SelectBrowserItemActionPage.qml b/nymea-app/ui/magic/SelectBrowserItemActionPage.qml
index 4efb0ef3..7f28c83b 100644
--- a/nymea-app/ui/magic/SelectBrowserItemActionPage.qml
+++ b/nymea-app/ui/magic/SelectBrowserItemActionPage.qml
@@ -10,7 +10,7 @@ Page {
     property Device device: null
     property string itemId: ""
 
-    signal selected(string itemId)
+    signal selected(string selectedItemId)
 
     header: NymeaHeader {
         onBackPressed: pageStack.pop()
@@ -34,12 +34,13 @@ Page {
             onClicked: {
                 if (model.browsable) {
                     var page = pageStack.push(Qt.resolvedUrl("SelectBrowserItemActionPage.qml"), {device: root.device, itemId: model.id});
-                    page.selected.connect(function() {
+                    page.selected.connect(function(selectedItemId) {
                         pageStack.pop();
-                        root.selected(model.id);
+                        root.selected(selectedItemId);
                     })
                 } else if (model.executable) {
                     pageStack.pop();
+                    print("selected:", model.id)
                     root.selected(model.id);
                 }
             }
diff --git a/nymea-app/ui/magic/SelectRuleActionPage.qml b/nymea-app/ui/magic/SelectRuleActionPage.qml
index 3d29eadd..3e8407ed 100644
--- a/nymea-app/ui/magic/SelectRuleActionPage.qml
+++ b/nymea-app/ui/magic/SelectRuleActionPage.qml
@@ -134,8 +134,9 @@ Page {
                     if (root.device) {
                         if (model.actionTypeId === "browse") {
                             var page = pageStack.push(Qt.resolvedUrl("SelectBrowserItemActionPage.qml"), {device: root.device});
-                            page.selected.connect(function(itemId) {
-                                root.ruleAction.browserItemId = itemId;
+                            page.selected.connect(function(selectedItemId) {
+                                print("selected is", selectedItemId)
+                                root.ruleAction.browserItemId = selectedItemId;
                                 root.ruleAction.actionTypeId = "";
                                 root.ruleAction.interfaceAction = "";
                                 pageStack.pop();