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

Merge PR #891: Fix things info for Zigbee nodes with multiple things

Browse Source
This commit is contained in:
jenkins 2022-09-24 13:28:40 +02:00
commit 6fe48307eb
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
View File

@ -271,7 +271,7 @@ SettingsPageBase {
if (destinationThings.count == 1) { if (destinationThings.count == 1) {
ret += " (" + destinationThings.get(0).name + ")" ret += " (" + destinationThings.get(0).name + ")"
} else if (destinationThings.count > 1) { } else if (destinationThings.count > 1) {
ret += " (" + destinationThing.count + " things)" ret += " (" + destinationThings.count + " things)"
} }
return ret return ret
@ -455,16 +455,6 @@ SettingsPageBase {
} }
} }
} }
// displayText: currentDestinationNodeThings.count > 0
// ? currentDestinationNodeThings.get(0).name
// : currentNode == root.coordinatorNode
// ? Configuration.systemName
// : currentNode.model
// ThingsProxy {
// id: currentDestinationNodeThings
// engine: _engine
// paramsFilter: {"ieeeAddress": destinationNodeComboBox.currentNode.ieeeAddress}
// }
delegate: NymeaItemDelegate { delegate: NymeaItemDelegate {
id: destinationNodeDelegate id: destinationNodeDelegate
property ZigbeeNode node: network.nodes.get(index) property ZigbeeNode node: network.nodes.get(index)
@ -480,8 +470,8 @@ SettingsPageBase {
? qsTr("Coordinator") ? qsTr("Coordinator")
: destinationNodeThings.count == 1 : destinationNodeThings.count == 1
? nodeThing.name ? nodeThing.name
: nodeThings.count > 1 : destinationNodeThings.count > 1
? qsTr("%1 things").arg(nodeThings.count) ? qsTr("%1 things").arg(destinationNodeThings.count)
: qsTr("Unrecognized device") : qsTr("Unrecognized device")
progressive: false progressive: false