From 345820885741289102d03b5dd60b153c482c5195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 13 Aug 2015 12:13:12 +0200 Subject: [PATCH] add states to device mapp of REST APi --- server/rest/devicesresource.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/rest/devicesresource.cpp b/server/rest/devicesresource.cpp index 56bede0b..899d11f0 100644 --- a/server/rest/devicesresource.cpp +++ b/server/rest/devicesresource.cpp @@ -204,7 +204,13 @@ HttpReply *DevicesResource::getConfiguredDevice(Device *device) const { qCDebug(dcRest) << "Get configured device with id:" << device->id().toString(); HttpReply *reply = createSuccessReply(); - reply->setPayload(QJsonDocument::fromVariant(JsonTypes::packDevice(device)).toJson()); + QVariantMap deviceMap = JsonTypes::packDevice(device); + QVariantList deviceStates = JsonTypes::packDeviceStates(device); + deviceMap.insert("states", deviceStates); + + qCDebug(dcRest) << deviceMap; + + reply->setPayload(QJsonDocument::fromVariant(deviceMap).toJson()); return reply; }