From 07cb99fed774b7526229555b725c74d78ef0b773 Mon Sep 17 00:00:00 2001
From: sameera910409 <sameera910409@gmail.com>
Date: Fri, 1 Sep 2017 12:23:30 +0530
Subject: [PATCH] fixes https://github.com/wso2/product-iots/issues/1346

---
 .../public/js/device-detail.js                                  | 2 +-
 .../public/templates/policy-compliance.hbs                      | 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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
index 069969d26..63a62685f 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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
@@ -302,8 +302,8 @@ var InitiateViewOption = null;
 
                             var viewModel = {};
                             viewModel["applications"] = data;
-                            viewModel["deviceType"] = deviceType;
                             viewModel["deviceId"] = deviceId;
+                            viewModel["deviceType"] = deviceType;
                             viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
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.device-view/public/templates/policy-compliance.hbs 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.device-view/public/templates/policy-compliance.hbs
index 61590d984..bac7603f9 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.device-view/public/templates/policy-compliance.hbs
+++ 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.device-view/public/templates/policy-compliance.hbs
@@ -15,7 +15,7 @@
     </p>
     <div class="actions">
         <div class="action-btn ripple">
-            <p><a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
+            <p><a href="{{appContext}}/devicemgt/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
               <i class="icon fw fw-view fw-2x"></i> <span>View Policy </span></a></p>
         </div>
     </div>