From 14a33b83d0f53edcad2f3d593f4d03cd7fa3c3ec Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Mon, 20 Jul 2020 12:46:46 +0200 Subject: [PATCH] Widget duplication Fix --- app/models/managers/SubDeviceManager.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/managers/SubDeviceManager.php b/app/models/managers/SubDeviceManager.php index a21168c..7fef551 100644 --- a/app/models/managers/SubDeviceManager.php +++ b/app/models/managers/SubDeviceManager.php @@ -75,6 +75,7 @@ class SubDeviceManager public static function getSubdevicesByRoomIds($roomIds = NULL) { if(empty($roomIds)) return NULL; + //TODO: @Patrik Check line 89 $rows = Db::loadAll(" SELECT d.room_id, sd.subdevice_id, sd.device_id, d.name, sd.type, sd.unit, r.value FROM subdevices sd JOIN devices d ON sd.device_id = d.device_id @@ -85,6 +86,7 @@ class SubDeviceManager FROM records GROUP BY subdevice_id ) + GROUP BY subdevice_id ORDER BY type DESC ", $roomIds);