From af4fdb0fdc4e3949fa1d07702c3b0afabca4d7e3 Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Fri, 21 Oct 2016 14:12:17 +0530 Subject: [PATCH 1/6] 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 2/6] 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 4/6] 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 eff6c9d367f72b1f91d5342d56fcc4557ca08b61 Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Tue, 25 Oct 2016 12:00:54 +0530 Subject: [PATCH 5/6] Fix spacing issue --- .../app/units/mdm.unit.policy.edit/public/js/edit.js | 7 +++---- 1 file changed, 3 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.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 d86fe5e684..eacae0229a 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 @@ -564,8 +564,8 @@ validateStep["policy-profile"] = function () { // If empty child inputs are present validationStatus = { "error": true, - "subErrorMsg": "One or more package names of " + - "applications are empty.", + "subErrorMsg": "One or more package names of applications are" + + " empty.", "erroneousFeature": operation }; continueToCheckNextInputs = false; @@ -573,8 +573,7 @@ validateStep["policy-profile"] = function () { // If duplicate input is present validationStatus = { "error": true, - "subErrorMsg": "Duplicate values exist with " + - "for package names.", + "subErrorMsg": "Duplicate values exist with for package names.", "erroneousFeature": operation }; continueToCheckNextInputs = false; From 8af596702bef6d95020a6c2ddb05f81a698c0d4d Mon Sep 17 00:00:00 2001 From: kamidu Date: Tue, 25 Oct 2016 12:05:08 +0530 Subject: [PATCH 6/6] Fix payload issues in manage payload policy --- .../public/js/operation-mod.js | 7 ++----- 1 file changed, 2 insertions(+), 5 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 9651e352b1..e1e03e547b 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 @@ -152,11 +152,8 @@ var operationModule = function () { case iosOperationConstants["DOMAIN_OPERATION_CODE"]: payload = { "operation": { - "accountDescription": operationData["calendarSubscriptionDescription"], - "hostName": operationData["calendarSubscriptionHostname"], - "username": operationData["calendarSubscriptionUsername"], - "password": operationData["calendarSubscriptionPassword"], - "useSSL": operationData["calendarSubscriptionUseSSL"] + "emailDomains": operationData["emailDomains"], + "webDomains": operationData["webDomains"] } }; break;