From 5e3bead760aa19bdc441b7c9affb4928c263446f Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 20 Oct 2016 10:20:27 +0530 Subject: [PATCH 01/42] Making the windows rest api to be aligned with android --- .../api/services/impl/ConfigurationMgtServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java index 1802df8dc7..2d299349e2 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java @@ -35,6 +35,7 @@ import org.wso2.carbon.device.mgt.mobile.windows.api.services.ConfigurationMgtSe import javax.jws.WebService; import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.util.ArrayList; import java.util.List; @@ -135,8 +136,8 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService { @GET @Path("/license") - public Response getLicense( - @HeaderParam("If-Modified-Since") String ifModifiedSince) { + @Produces(MediaType.TEXT_PLAIN) + public Response getLicense(@HeaderParam("If-Modified-Since") String ifModifiedSince) { License license; try { license = @@ -149,7 +150,7 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService { throw new UnexpectedServerErrorException( new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build()); } - return Response.status(Response.Status.OK).entity(license).build(); + return Response.status(Response.Status.OK).entity((license == null) ? null : license.getText()).build(); } } From 7478dc417341c931a98d56642e791f91c83847b2 Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 20 Oct 2016 10:29:41 +0530 Subject: [PATCH 02/42] Reverting changes to API --- .../api/services/impl/ConfigurationMgtServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java index 2d299349e2..1802df8dc7 100644 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java @@ -35,7 +35,6 @@ import org.wso2.carbon.device.mgt.mobile.windows.api.services.ConfigurationMgtSe import javax.jws.WebService; import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.util.ArrayList; import java.util.List; @@ -136,8 +135,8 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService { @GET @Path("/license") - @Produces(MediaType.TEXT_PLAIN) - public Response getLicense(@HeaderParam("If-Modified-Since") String ifModifiedSince) { + public Response getLicense( + @HeaderParam("If-Modified-Since") String ifModifiedSince) { License license; try { license = @@ -150,7 +149,7 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService { throw new UnexpectedServerErrorException( new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build()); } - return Response.status(Response.Status.OK).entity((license == null) ? null : license.getText()).build(); + return Response.status(Response.Status.OK).entity(license).build(); } } From af4fdb0fdc4e3949fa1d07702c3b0afabca4d7e3 Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Fri, 21 Oct 2016 14:12:17 +0530 Subject: [PATCH 03/42] Fix incorrect spacing - AFW COSU --- .../public/js/operation-mod.js | 6 +++--- .../units/mdm.unit.policy.create/public/js/policy-create.js | 2 +- 2 files changed, 4 insertions(+), 4 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 a3b6161f6e..43339658b9 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 @@ -80,9 +80,9 @@ var operationModule = function () { "AUTO_TIME" : "AUTO_TIME", "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED", "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED", - "APPLICATION_OPERATION_CODE":"APP-RESTRICTION", - "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY", - "KIOSK_APPS_CODE": "KIOSK_APPS" + "APPLICATION_OPERATION_CODE" : "APP-RESTRICTION", + "SYSTEM_UPDATE_POLICY_CODE" : "SYSTEM_UPDATE_POLICY", + "KIOSK_APPS_CODE" : "KIOSK_APPS" }; // Constants to define Windows Operation Constants 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.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index 1c1eefcfd6..4c88108fa7 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.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -2550,7 +2550,7 @@ var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneI } } var paneSelector = "#" + paneID; - if(slideDownVotes > 0) { + if (slideDownVotes > 0) { $(paneSelector).removeClass("hidden"); } else { $(paneSelector).addClass("hidden"); From 10e0ddd8b3754ca0eec37c7653f1261bd9794e61 Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Fri, 21 Oct 2016 14:31:32 +0530 Subject: [PATCH 04/42] Fix incorrect spacing - AFW COSU --- .../templates/hidden-operations-android.hbs | 33 ++++++------------- .../mdm.unit.policy.edit/public/js/edit.js | 4 +-- 2 files changed, 11 insertions(+), 26 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.policy.create/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.create/public/templates/hidden-operations-android.hbs index adf9008d46..6e87be0775 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.create/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.create/public/templates/hidden-operations-android.hbs @@ -24,11 +24,9 @@ Encryption Settings - + - + @@ -63,8 +61,7 @@ Application Restrictions - + @@ -105,8 +102,7 @@
This configuration can be used to set a passcode policy to an Android Device. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -259,8 +255,7 @@
This configurations can be used to restrict certain settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -662,8 +657,7 @@
@@ -697,10 +691,8 @@
- This configuration can be used to encrypt data on an Android device, when the device is - locked and - make it readable when the passcode is entered. Once this configuration profile is installed - on a device, + This configuration can be used to encrypt data on an Android device, when the device is locked and + make it readable when the passcode is entered. Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -744,8 +736,7 @@
This configurations can be used to configure Wi-Fi access on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1018,8 +1009,7 @@
This configurations can be used to configure VPN settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1179,7 +1169,6 @@ - - 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.edit/public/templates/hidden-operations-android-edit.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.edit/public/templates/hidden-operations-android-edit.hbs index 510e70a29d..c6edc117da 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.edit/public/templates/hidden-operations-android-edit.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.edit/public/templates/hidden-operations-android-edit.hbs @@ -1311,7 +1311,6 @@ -
This configuration can be used to set system update policy to an Android Device in COSU. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1460,7 +1458,6 @@
-
This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
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-view.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-view.hbs index 4e6758d94e..51f837b549 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-view.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-view.hbs @@ -65,18 +65,18 @@ - + - +   System Update Policy (COSU) - + - + Whitelist Apps (COSU) @@ -1238,7 +1238,6 @@
-
This configuration can be used to set system update policy to an Android Device in COSU. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1385,7 +1383,6 @@
-
This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU. - Once this configuration profile is installed on a device, corresponding users will not be - able + Once this configuration profile is installed on a device, corresponding users will not be able to modify these settings on their devices.
@@ -1417,9 +1413,9 @@
From 3d90487466e3658b24e0176a9ebbf64b92ebc4ee Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Fri, 21 Oct 2016 15:02:29 +0530 Subject: [PATCH 06/42] Fix incorrect spacing - AFW COSU --- .../mdm.unit.policy.create/public/js/policy-create.js | 8 ++++---- .../app/units/mdm.unit.policy.edit/public/js/edit.js | 11 +++++------ 2 files changed, 9 insertions(+), 10 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.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index 4c88108fa7..9b0f6753af 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.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -47,10 +47,10 @@ var androidOperationConstants = { "WIFI_OPERATION_CODE": "WIFI", "VPN_OPERATION": "vpn", "VPN_OPERATION_CODE": "VPN", - "APPLICATION_OPERATION":"app-restriction", - "APPLICATION_OPERATION_CODE":"APP-RESTRICTION", - "KIOSK_APPS_CODE":"KIOSK_APPS", - "KIOSK_APPS":"cosu-whitelisted-applications" + "APPLICATION_OPERATION": "app-restriction", + "APPLICATION_OPERATION_CODE": "APP-RESTRICTION", + "KIOSK_APPS_CODE": "KIOSK_APPS", + "KIOSK_APPS": "cosu-whitelisted-applications" }; // Constants to define iOS Operation Constants 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.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js index 402873a6ac..57a6a417de 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.edit/public/js/edit.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js @@ -113,10 +113,10 @@ var androidOperationConstants = { "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE", "WIFI_OPERATION": "wifi", "WIFI_OPERATION_CODE": "WIFI", - "APPLICATION_OPERATION":"app-restriction", - "APPLICATION_OPERATION_CODE":"APP-RESTRICTION", - "KIOSK_APPS_CODE":"KIOSK_APPS", - "KIOSK_APPS":"cosu-whitelisted-applications" + "APPLICATION_OPERATION": "app-restriction", + "APPLICATION_OPERATION_CODE": "APP-RESTRICTION", + "KIOSK_APPS_CODE": "KIOSK_APPS", + "KIOSK_APPS": "cosu-whitelisted-applications" }; // Constants to define Android Operation Constants @@ -524,8 +524,7 @@ validateStep["policy-profile"] = function () { "erroneousFeature": operation }; continueToCheckNextInputs = false; - } - else { + } else { childInputCount = 0; childInputArray = []; emptyChildInputCount = 0; From a2d9d4302ca91271bd110ee5528aade2a339d427 Mon Sep 17 00:00:00 2001 From: dilanua Date: Sun, 23 Oct 2016 20:41:59 +0530 Subject: [PATCH 07/42] Fixing feature configured icon malfunctioning issue on switch double-click --- .../public/js/policy-create.js | 16 ++++++++++++---- .../units/mdm.unit.policy.edit/public/js/edit.js | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 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.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index 1c1eefcfd6..bcef26ec8e 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.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -2793,20 +2793,28 @@ $(document).ready(function () { // $(advanceOperations).on('hidden.bs.collapse', function (event) { var collapsedFeatureBody = event.target.id; - var featureConfiguringSwitch = "#" + collapsedFeatureBody. - substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]"; + var operation = collapsedFeatureBody.substr(0, collapsedFeatureBody.lastIndexOf("-")); + var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]"; + var featureConfiguredIcon = "#" + operation + "-configured"; if ($(featureConfiguringSwitch).prop("checked") == true) { $(featureConfiguringSwitch).prop("checked", false); } + if (!$(featureConfiguredIcon).hasClass("hidden")) { + $(featureConfiguredIcon).addClass("hidden"); + } }); $(advanceOperations).on('shown.bs.collapse', function (event) { var expandedFeatureBody = event.target.id; - var featureConfiguringSwitch = "#" + expandedFeatureBody. - substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]"; + var operation = expandedFeatureBody.substr(0, expandedFeatureBody.lastIndexOf("-")); + var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]"; + var featureConfiguredIcon = "#" + operation + "-configured"; if ($(featureConfiguringSwitch).prop("checked") == false) { $(featureConfiguringSwitch).prop("checked", true); } + if ($(featureConfiguredIcon).hasClass("hidden")) { + $(featureConfiguredIcon).removeClass("hidden"); + } }); // 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.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js index 7c899b3cb4..3e2728ca18 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.edit/public/js/edit.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js @@ -2556,20 +2556,28 @@ $(document).ready(function () { // $(advanceOperations).on('hidden.bs.collapse', function (event) { var collapsedFeatureBody = event.target.id; - var featureConfiguringSwitch = "#" + collapsedFeatureBody. - substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]"; + var operation = collapsedFeatureBody.substr(0, collapsedFeatureBody.lastIndexOf("-")); + var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]"; + var featureConfiguredIcon = "#" + operation + "-configured"; if ($(featureConfiguringSwitch).prop("checked") == true) { $(featureConfiguringSwitch).prop("checked", false); } + if (!$(featureConfiguredIcon).hasClass("hidden")) { + $(featureConfiguredIcon).addClass("hidden"); + } }); $(advanceOperations).on('shown.bs.collapse', function (event) { var expandedFeatureBody = event.target.id; - var featureConfiguringSwitch = "#" + expandedFeatureBody. - substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]"; + var operation = expandedFeatureBody.substr(0, expandedFeatureBody.lastIndexOf("-")); + var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]"; + var featureConfiguredIcon = "#" + operation + "-configured"; if ($(featureConfiguringSwitch).prop("checked") == false) { $(featureConfiguringSwitch).prop("checked", true); } + if ($(featureConfiguredIcon).hasClass("hidden")) { + $(featureConfiguredIcon).removeClass("hidden"); + } }); // From a31940e9d91c325f0bb57d010c1df1084f12c73d Mon Sep 17 00:00:00 2001 From: Madawa Soysa Date: Thu, 13 Oct 2016 19:05:14 +0530 Subject: [PATCH 08/42] Refactoring pages to use new modal unit --- .../app/pages/mdm.page.policies/policies.hbs | 388 +----------------- .../public/js/policy-list.js | 132 ++++-- 2 files changed, 93 insertions(+), 427 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs index e5d83caef0..03cca30a02 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs @@ -17,6 +17,7 @@ }} {{unit "cdmf.unit.ui.title" pageTitle="Policy Management"}} {{unit "cdmf.unit.data-tables-extended"}} +{{unit "cdmf.unit.ui.modal"}} {{#zone "topCss"}}