From d05280cdf5c92f0e3a7b69946c3cce48a767e744 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saad.sahibjan@gmail.com>
Date: Mon, 26 Sep 2016 21:59:38 +0530
Subject: [PATCH] Fix for https://wso2.org/jira/browse/EMM-1584

---
 .../mdm.unit.device.operation-mod/public/js/operation-mod.js  | 1 +
 .../public/templates/hidden-operations-android.hbs            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 735e05321e..0672461471 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -1450,6 +1450,7 @@ var operationModule = function () {
                 } else if (operationDataObj.is(":radio")) {
                     if (operationDataObj.val() == uiPayload[key]) {
                         operationDataObj.attr("checked", true);
+                        operationDataObj.trigger("click");
                     }
                 } else if (operationDataObj.is("select")) {
                     operationDataObj.val(value);
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
index 1e064487d1..851adebf13 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
@@ -1325,7 +1325,7 @@
                         </label>
                         <select id="cosu-system-update-policy-window-start-time"
                                 class="form-control operationDataKeys"
-                                data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                                data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0" disabled>
                             <option value="1440" selected="selected">12 AM</option>
                             <option value="60">1 AM</option>
                             <option value="120">2 AM</option>
@@ -1361,7 +1361,7 @@
                         </label>
                         <select id="cosu-system-update-policy-window-end-time"
                                 class="form-control operationDataKeys"
-                                data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                                data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0" disabled>
                             <option value="1440" selected="selected">12 AM</option>
                             <option value="60">1 AM</option>
                             <option value="120">2 AM</option>