From 2dd86c80b417f019d97fa0de4d2297a9bdcf3b85 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 13 Oct 2016 20:11:38 +0530 Subject: [PATCH 1/4] Fix for the bug EMM-1719 --- .../mdm.unit.policy.edit/public/js/edit.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) 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 5e0c71ac40..f7f1471a58 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 @@ -2543,6 +2543,28 @@ $(document).ready(function () { } }); + /** + * + * Fix for the bug EMM-1719 + */ + $(advanceOperations).on('hidden.bs.collapse', function () { + if($(this).find('input').prop('checked')){ + $(this).find('input').prop('checked',false); + } + }); + + /** + * + * Fix for the bug EMM-1719 + */ + $(advanceOperations).on('shown.bs.collapse', function () { + if($(this).find('input').prop('checked') == false){ + $(this).find('input').prop('checked',true); + } + }); + + + // adding support for cloning multiple profiles per feature with cloneable class definitions $(advanceOperations).on("click", ".multi-view.add.enabled", function () { // get a copy of .cloneable and create new .cloned div element From cce96f26fcfe12fccb80bfb3516546ee8805952d Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Fri, 14 Oct 2016 14:48:45 +0530 Subject: [PATCH 2/4] Fix for the bug EMM-1719 --- .../app/units/mdm.unit.policy.edit/public/js/edit.js | 10 ++-------- 1 file changed, 2 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.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 f7f1471a58..4bcc38bff5 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 @@ -2543,20 +2543,14 @@ $(document).ready(function () { } }); - /** - * - * Fix for the bug EMM-1719 - */ + $(advanceOperations).on('hidden.bs.collapse', function () { if($(this).find('input').prop('checked')){ $(this).find('input').prop('checked',false); } }); - /** - * - * Fix for the bug EMM-1719 - */ + $(advanceOperations).on('shown.bs.collapse', function () { if($(this).find('input').prop('checked') == false){ $(this).find('input').prop('checked',true); From 89336bb80f384567efd456ecc2b0d32aa0de7134 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Fri, 14 Oct 2016 17:32:35 +0530 Subject: [PATCH 3/4] skip download agent link added --- .../download-agent.hbs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs index 5b2429a12e..720d6b4373 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs @@ -52,4 +52,15 @@ under the License. --}} +
+
+
+
+
+ For evaluation purposes, you can skip the installer and proceed with enrollment. +

+ Skip Agent Installer +
+
+
{{/zone}} \ No newline at end of file From ec138be5940341c08332939f0a37dffcbb10b676 Mon Sep 17 00:00:00 2001 From: kamidu Date: Fri, 14 Oct 2016 20:01:32 +0530 Subject: [PATCH 4/4] Fixing the ui issue is ios policy modification and policy view --- .../app/units/mdm.unit.policy.edit/edit.hbs | 6 +- ...hbs => hidden-operations-android-edit.hbs} | 0 ...ios.hbs => hidden-operations-ios-edit.hbs} | 647 ++- ...hbs => hidden-operations-windows-edit.hbs} | 0 ...hbs => hidden-operations-android-view.hbs} | 0 .../templates/hidden-operations-ios-view.hbs | 4965 +++++++++++++++++ .../templates/hidden-operations-ios.hbs | 4728 ---------------- ...hbs => hidden-operations-windows-view.hbs} | 0 .../app/units/mdm.unit.policy.view/view.hbs | 6 +- 9 files changed, 5411 insertions(+), 4941 deletions(-) rename 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.hbs => hidden-operations-android-edit.hbs} (100%) rename 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-ios.hbs => hidden-operations-ios-edit.hbs} (90%) rename 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-windows.hbs => hidden-operations-windows-edit.hbs} (100%) rename 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 => hidden-operations-android-view.hbs} (100%) create mode 100644 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-ios-view.hbs delete mode 100644 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-ios.hbs rename 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-windows.hbs => hidden-operations-windows-view.hbs} (100%) 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/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/edit.hbs index e51e8844d6..14a1df933d 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/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/edit.hbs @@ -264,13 +264,13 @@ {{/zone}} {{#zone "bottomJs"}} - - - {{js "js/edit.js"}} {{/zone}} 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.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 similarity index 100% rename from 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.hbs rename to 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 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-ios.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-ios-edit.hbs similarity index 90% rename from 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-ios.hbs rename to 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-ios-edit.hbs index 25bc972fa1..afc6dd9c67 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-ios.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-ios-edit.hbs @@ -6,103 +6,103 @@ Passcode Policy - - - + + + Restrictions - - - + + + Wi-Fi Settings - + - + Email Settings - + - + AirPlay Settings - + - + Manage Domains - + - + LDAP Settings - + - + Calendar - - - + + + Calendar Subscription - - - + + + @@ -118,12 +118,12 @@ Cellular Network Settings - - - + + + @@ -139,12 +139,12 @@ Per Application VPN - - - + + + @@ -152,12 +152,12 @@ Applications Restrictions - - - + + + @@ -418,7 +418,7 @@
@@ -452,11 +452,13 @@