From 12bdceb2ac1aa4bcefaa5b23cb12911000b1dc18 Mon Sep 17 00:00:00 2001 From: NuwanSameera Date: Mon, 14 Dec 2015 10:21:27 +0530 Subject: [PATCH] Update digital display related files --- .../device-view.js} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/{jaggerryapps/devicemgt/app/units/iot.unit.device.digitaldisplay-overview/digitaldisplay-overview.js => jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.device-view/device-view.js} (66%) diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggerryapps/devicemgt/app/units/iot.unit.device.digitaldisplay-overview/digitaldisplay-overview.js b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.device-view/device-view.js similarity index 66% rename from features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggerryapps/devicemgt/app/units/iot.unit.device.digitaldisplay-overview/digitaldisplay-overview.js rename to features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.device-view/device-view.js index b9bffdecd8..f180e7e4ec 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggerryapps/devicemgt/app/units/iot.unit.device.digitaldisplay-overview/digitaldisplay-overview.js +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.device-view/device-view.js @@ -1,6 +1,6 @@ -function onRequest (context) { +function onRequest(context) { var log = new Log("detail.js"); - var deviceType = request.getParameter("type"); + var deviceType = context.uriParams.deviceType; var deviceId = request.getParameter("id"); if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) { @@ -12,11 +12,11 @@ function onRequest (context) { var deviceInfo = device.properties.DEVICE_INFO; if (deviceInfo != undefined && String(deviceInfo.toString()).length > 0) { deviceInfo = parse(stringify(deviceInfo)); - viewModel.system = device.properties.IMEI; - viewModel.machine = "Digital Display"; - viewModel.vendor = device.properties.VENDOR; - } - device.viewModel = viewModel; + viewModel.system = device.properties.IMEI; + viewModel.machine = "digital_display"; + viewModel.vendor = device.properties.VENDOR; + } + device.viewModel = viewModel; } context.device = device;