From 57f0ea7ce4712bbf8d5928ac20c23cd6ffadc77f Mon Sep 17 00:00:00 2001
From: Supun94 <supunpramoda@gmail.com>
Date: Mon, 19 Dec 2016 04:56:50 +0530
Subject: [PATCH] Changing policy compliance view

---
 .../public/js/device-detail.js                                  | 2 ++
 .../public/templates/policy-compliance.hbs                      | 2 +-
 .../public/js/device-detail.js                                  | 2 ++
 .../public/templates/policy-compliance.hbs                      | 2 +-
 4 files changed, 6 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 c68579335..0c08e071e 100755
--- 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
@@ -231,6 +231,8 @@ var InitiateViewOption = null;
                             var viewModel = {};
                             viewModel["applications"] = data;
                             viewModel["deviceType"] = deviceType;
+                            viewModel["deviceId"] = deviceId;
+                            viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
                         } else {
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 eac53066c..b38f5cbd5 100755
--- 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
@@ -45,7 +45,7 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/devicemgt/policies/view?id={{policy.id}}" class="cu-btn-inner
+                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}" class="cu-btn-inner
                 policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>
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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
index a90864968..f08cfed44 100755
--- 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.device-view/public/js/device-detail.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.device-view/public/js/device-detail.js
@@ -237,6 +237,8 @@ var InitiateViewOption = null;
                             var viewModel = {};
                             viewModel["applications"] = data;
                             viewModel["deviceType"] = deviceType;
+                            viewModel["deviceId"] = deviceId;
+                            viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);
                         } else {
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.device-view/public/templates/policy-compliance.hbs 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.device-view/public/templates/policy-compliance.hbs
index d20ca7a9c..1115f9ff9 100755
--- 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.device-view/public/templates/policy-compliance.hbs
+++ 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.device-view/public/templates/policy-compliance.hbs
@@ -45,7 +45,7 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/emm/policies/view?id={{policy.id}}" class="cu-btn-inner policy-view-link" data-id="{{id}}">
+                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}"  class="cu-btn-inner policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>
                         <i class="fw fw-view fw-stack-1x"></i>