From 3f39ebf757db2e3a15f10b855578f54dce841903 Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 27 Oct 2016 09:23:40 +0530 Subject: [PATCH] Fix for EMM-1766 --- .../public/js/operation-mod.js | 9 +++++++++ .../mdm.unit.policy.create/public/js/policy-create.js | 2 -- .../jaggeryapps/emm-web-agent/app/conf/config.json | 1 + .../download-agent.hbs | 2 ++ .../download-agent.js | 1 + 5 files changed, 13 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 8ca88a0a1..b6b0795ca 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 @@ -837,6 +837,15 @@ var operationModule = function () { "encryptStorageEnabled": operationPayload["encrypted"] }; break; + case androidOperationConstants["WORK_PROFILE_CODE"]: + payload = { + "workProfilePolicyProfileName": operationPayload["profileName"], + "workProfilePolicyEnableSystemApps": operationPayload["enableSystemApps"], + "workProfilePolicyHideSystemApps": operationPayload["hideSystemApps"], + "workProfilePolicyUnhideSystemApps": operationPayload["unhideSystemApps"], + "workProfilePolicyEnablePlaystoreApps": operationPayload["enablePlaystoreApps"] + }; + break; case androidOperationConstants["WIFI_OPERATION_CODE"]: payload = { "wifiSSID": operationPayload["ssid"], 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 edcdc00f6..196a78f7c 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 @@ -2382,8 +2382,6 @@ var savePolicy = function (policy, isActive, serviceURL) { payload["roles"] = []; } - console.log(JSON.stringify(payload)); - invokerUtil.post( serviceURL, payload, diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json index 8e2b80c9f..5a58bf3d3 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json @@ -10,6 +10,7 @@ "adminService":"%https.ip%", "idPServer":"%https.ip%", "callBackUrl":"%https.ip%/mdm-admin", + "enableEval":true, "oauthProvider": { "appRegistration": { "appType": "webapp", 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 c4a0944ad..fc528dbb3 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,6 +52,7 @@ under the License. --}} + {{#if enableEval}}
@@ -65,4 +66,5 @@ under the License. --}}
+ {{/if}} {{/zone}} \ No newline at end of file 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.js 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.js index cdc1d7695..172e04692 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.js +++ 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.js @@ -33,5 +33,6 @@ function onRequest(context) { } else { viewModel.companyName = companyProps.companyName; } + viewModel.enableEval = mdmProps.enableEval; return viewModel; } \ No newline at end of file