From 61362c16e62f6ee116234e2dccd763b1b6717513 Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Tue, 29 Aug 2017 12:03:05 +0530 Subject: [PATCH] This includes fixes for wso2/product-iots#1293 --- .../units/cdmf.unit.device.type.android.type-view/type-view.js | 2 +- .../units/cdmf.unit.device.type.windows.type-view/type-view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js index 881806f4c5..3d4869d91e 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js @@ -26,7 +26,7 @@ function onRequest(context) { if (isCloud) { viewModel["enrollmentURL"] = "https://play.google.com/store/apps/details?id=org.wso2.iot.agent"; } else { - viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["androidEnrollmentDir"]; + viewModel["enrollmentURL"] = devicemgtProps["managerHTTPSURL"] + devicemgtProps["androidEnrollmentDir"]; } return viewModel; } \ No newline at end of file diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.js index 0c1624d4bd..eb13c2c898 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.js +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.js @@ -20,6 +20,6 @@ function onRequest(context){ var viewModel = {}; var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"]; viewModel["hostName"] = devicemgtProps["httpsURL"]; - viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["windowsEnrollmentDir"]; + viewModel["enrollmentURL"] = devicemgtProps["managerHTTPSURL"] + devicemgtProps["windowsEnrollmentDir"]; return viewModel; } \ No newline at end of file