From 79a25f15b7178a6f35da84cc599cbee867d97048 Mon Sep 17 00:00:00 2001 From: kamidu Date: Fri, 21 Oct 2016 16:21:36 +0530 Subject: [PATCH] Fix for ui issues in policy creation --- .../public/js/operation-mod.js | 8 +- .../templates/hidden-operations-android.hbs | 2 +- .../templates/hidden-operations-ios.hbs | 300 +++++++++--------- .../templates/hidden-operations-windows.hbs | 2 +- 4 files changed, 155 insertions(+), 157 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..d4eec72fac 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 @@ -756,13 +756,11 @@ var operationModule = function () { } }; break; - case iosOperationConstants["DOMAIN_CODE"]: + case iosOperationConstants["DOMAIN_OPERATION_CODE"]: operationType = operationTypeConstants["PROFILE"]; payload = { - "operation": { - "emailDomains": operationData["emailDomains"], - "webDomains": operationData["webDomains"] - } + "emailDomains": operationData["emailDomains"], + "webDomains": operationData["webDomains"] }; break; case iosOperationConstants["CELLULAR_OPERATION_CODE"]: 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..10fcf82e26 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 @@ -1362,7 +1362,7 @@
- + 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-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.create/public/templates/hidden-operations-ios.hbs index c0fcd1c10b..4d326607c7 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-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.create/public/templates/hidden-operations-ios.hbs @@ -198,7 +198,7 @@ checked="checked"/> -    Force Passcode + Force Passcode @@ -211,7 +211,7 @@ data-key="passcodePolicyAllowSimple" checked="checked"/> -    Allow simple value + Allow simple value @@ -224,7 +224,7 @@ data-key="passcodePolicyRequireAlphanumeric" checked="checked"/> -    Require alphanumeric value + Require alphanumeric value @@ -429,7 +429,7 @@ data-key="overridePrimary" data-default="true"/> -    Override Primary + Override Primary @@ -441,7 +441,7 @@ onchange="slideDownPaneAgainstValueSet(this, 'vpn-ondemand-config', ['true'])"/> -    On-demand Enabled + On-demand Enabled @@ -454,12 +454,12 @@
- + -   + Add Domain @@ -518,12 +518,12 @@
- + -   + Add Domain @@ -582,12 +582,12 @@
- + -   + Add Domain @@ -649,12 +649,12 @@
- + -   + Add Configuration @@ -746,7 +746,7 @@ onchange="slideDownPaneAgainstValueSet(this, 'pptp-card-config', ['false'])"/> -    Token Card Enabled + Token Card Enabled @@ -778,7 +778,7 @@ -    RSA SecureID Enabled + RSA SecureID Enabled @@ -789,7 +789,7 @@ data-key="pptpCCPEnabled" data-default="false" onchange="slideDownPaneAgainstValueSet(this, 'pptp-encryption-config', ['true'])"/> -    CCP Encryption Enabled + CCP Encryption Enabled @@ -802,7 +802,7 @@ data-default="false"/> -    Automatic (CCPMPPE40) Encryption Level Enabled + Automatic (CCPMPPE40) Encryption Level Enabled @@ -814,7 +814,7 @@ data-default="false"/> -    Maximum (CCPMPPE128) Encryption Level Enabled + Maximum (CCPMPPE128) Encryption Level Enabled @@ -843,7 +843,7 @@ onchange="slideDownPaneAgainstValueSet(this, 'l2tp-card-config', ['false'])"/> -    Token Card Enabled + Token Card Enabled @@ -875,7 +875,7 @@ -    RSA SecureID Enabled + RSA SecureID Enabled @@ -954,7 +954,7 @@ data-default="false" onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/> -    XAuth Enabled + XAuth Enabled @@ -978,7 +978,7 @@ data-key="ipsecPromptForVPNPIN" data-default="false"/> -    Prompt for VPN PIN + Prompt for VPN PIN @@ -1116,7 +1116,7 @@ data-default="false" onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/> -    Extended Authentication Enabled + Extended Authentication Enabled @@ -1236,7 +1236,7 @@ data-default="true"/> -    On Demand Match App Enabled + On Demand Match App Enabled @@ -1248,12 +1248,12 @@
- + -   + Add Safari Domain @@ -1342,12 +1342,12 @@
- + -   + Add Mapping @@ -1465,7 +1465,7 @@ data-key="wifiHiddenNetwork" data-default="false"/> -    Hidden Network + Hidden Network @@ -1477,7 +1477,7 @@ data-key="wifiIsHotSpot" data-default="false"/> -    Hot Spot + Hot Spot @@ -1490,7 +1490,7 @@ data-default="false"/> -    Enable Service Provider Roaming + Enable Service Provider Roaming @@ -1502,7 +1502,7 @@ data-key="wifiAutoJoin" data-default="true" checked="checked"/> -    Auto Join + Auto Join @@ -1614,7 +1614,7 @@ data-default="true" checked="checked"/> -    Allow Proxy PAC Fallback + Allow Proxy PAC Fallback @@ -1682,7 +1682,7 @@ -    TLS + TLS

@@ -1690,7 +1690,7 @@ -    LEAP + LEAP

@@ -1698,7 +1698,7 @@ -    EAP-SIM + EAP-SIM

@@ -1706,7 +1706,7 @@ -    TTLS + TTLS

@@ -1714,7 +1714,7 @@ -    EAP-AKA + EAP-AKA

@@ -1722,7 +1722,7 @@ -    PEAP + PEAP

@@ -1730,7 +1730,7 @@ -    EAP-FAST + EAP-FAST @@ -1768,7 +1768,7 @@ data-default="false"/> -    One Time Password + One Time Password @@ -1784,13 +1784,13 @@
- -   + Add Certificate Payload Anchor UUID @@ -1853,13 +1853,13 @@
- -   + Add TLS Trusted Server Certificate Name @@ -1921,7 +1921,7 @@ data-default="true" checked="checked"/> -    Allow TLS Trust Exceptions + Allow TLS Trust Exceptions @@ -1934,7 +1934,7 @@ data-default="true" checked="checked"/> -    Require TLS Certificate + Require TLS Certificate @@ -1985,7 +1985,7 @@ data-key="wifiEAPFastUsePAC" data-default="false"/> -    Use existing PAC for EAP-FAST + Use existing PAC for EAP-FAST @@ -1999,7 +1999,7 @@ data-key="wifiEAPFastProvisionPAC" data-default="false"/> -    Allow PAC Provisioning + Allow PAC Provisioning @@ -2014,7 +2014,7 @@ data-default="false"/> -    Allow Anonymous PAC Provisioning + Allow Anonymous PAC Provisioning @@ -2065,13 +2065,13 @@
- -   + Add Roaming Consortium OI @@ -2135,12 +2135,12 @@
- + -   + Add NAI Realm Name @@ -2202,12 +2202,12 @@
- + -   + Add MCC/MNC Pair @@ -2369,7 +2369,7 @@ data-key="emailPreventMove" data-default="false"/> -    Prevent Move + Prevent Move @@ -2381,7 +2381,7 @@ data-key="emailPreventAppSheet" data-default="false"/> -    Prevent App Sheet + Prevent App Sheet @@ -2393,7 +2393,7 @@ data-key="emailSMIMEEnabled" data-default="false"/> -    Enable S/MIME + Enable S/MIME @@ -2432,7 +2432,7 @@ data-default="false"/> -    Enable Per-Message Signing and Encryption Switch + Enable Per-Message Signing and Encryption Switch @@ -2445,7 +2445,7 @@ data-default="false"/> -    Allow Recent Address syncing + Allow Recent Address syncing @@ -2474,7 +2474,7 @@ data-key="emailIncomingUseSSL" data-default="true" checked="checked"/> -    Use Secure Socket Layer ( SSL ) + Use Secure Socket Layer ( SSL ) @@ -2556,7 +2556,7 @@ data-key="emailOutgoingUseSSL" data-default="true" checked="checked"/> -    Use Secure Socket Layer ( SSL ) + Use Secure Socket Layer ( SSL ) @@ -2609,7 +2609,7 @@ data-key="emailOutgoingPasswordSameAsIncomingPassword" data-default="false"/> -    Outgoing password same as incoming password + Outgoing password same as incoming password @@ -2670,13 +2670,13 @@
- -   + Add Credential @@ -2746,13 +2746,13 @@
- -   + Add Destination @@ -2845,13 +2845,13 @@
- -   + Add Unmarked Email Domains @@ -2909,13 +2909,13 @@ @@ -3034,7 +3034,7 @@ data-key="ldapUseSSL" data-default="true" checked="checked"/> -    Use Secure Socket Layer ( SSL ) + Use Secure Socket Layer ( SSL ) @@ -3072,13 +3072,13 @@
- -   + Add Search Setting @@ -3220,7 +3220,7 @@ checked="checked"/> -    Use Secure Socket Layer ( SSL ) + Use Secure Socket Layer ( SSL ) @@ -3344,7 +3344,7 @@ data-key="calendarSubscriptionUseSSL" checked="checked"/> -    Use Secure Socket Layer ( SSL ) + Use Secure Socket Layer ( SSL ) @@ -3417,13 +3417,13 @@
- -   + Add APN Configuration @@ -3594,13 +3594,13 @@
- -   + Add APN Configuration @@ -3730,7 +3730,7 @@ data-key="restrictionsAllowCamera" data-default="true" checked="checked"/> -    Allow use of camera + Allow use of camera @@ -3743,7 +3743,7 @@ data-key="restrictionsAllowChat" data-default="true" checked="checked"/> -    Allow Chat + Allow Chat @@ -3756,7 +3756,7 @@ data-key="restrictionsAllowScreenShot" data-default="true" checked="checked"/> -    Allow screenshots + Allow screenshots @@ -3769,7 +3769,7 @@ data-key="restrictionsAllowAirDrop" data-default="true" checked="checked"/> -    Allow AirDrop ( Supervised only ) + Allow AirDrop ( Supervised only ) @@ -3782,7 +3782,7 @@ data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/> -    Allow voice dialing while device is locked + Allow voice dialing while device is locked @@ -3796,7 +3796,7 @@ data-default="true" checked="checked"/> -    Allow Siri + Allow Siri @@ -3811,7 +3811,7 @@ checked="checked"/> -    Allow Siri while device is locked + Allow Siri while device is locked @@ -3826,7 +3826,7 @@ checked="checked"/> -    Force use of Siri profanity filter + Force use of Siri profanity filter @@ -3841,7 +3841,7 @@ data-default="true" checked="checked"/> -    Allow Siri to query user-generated content from web ( Supervised only ) + Allow Siri to query user-generated content from web ( Supervised only ) @@ -3857,7 +3857,7 @@ data-default="true" checked="checked"/> -    Allow modifying account settings ( Supervised only ) + Allow modifying account settings ( Supervised only ) @@ -3871,7 +3871,7 @@ data-default="true" checked="checked"/> -    Allow modifying cellular data app settings ( Supervised only ) + Allow modifying cellular data app settings ( Supervised only ) @@ -3884,7 +3884,7 @@ data-key="restrictionsAllowBookstore" data-default="true" checked="checked"/> -    Enable iBookStore ( Supervised only ) + Enable iBookStore ( Supervised only ) @@ -3898,7 +3898,7 @@ data-default="true" checked="checked"/> -    Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 ) + Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 ) @@ -3912,7 +3912,7 @@ data-default="true" checked="checked"/> -    Allow installing apps + Allow installing apps @@ -3925,7 +3925,7 @@ data-key="restrictionsAllowAppRemoval" data-default="true" checked="checked"/> -    Allow removing apps + Allow removing apps @@ -3939,7 +3939,7 @@ data-default="true" checked="checked"/> -    Allow in-app purchase + Allow in-app purchase @@ -3953,7 +3953,7 @@ data-default="true" checked="checked"/> -    Require iTunes store password for all purchases + Require iTunes store password for all purchases @@ -3966,7 +3966,7 @@ data-key="restrictionsAllowCloudBackup" data-default="true" checked="checked"/> -    Allow iCloud backup + Allow iCloud backup @@ -3980,7 +3980,7 @@ data-default="true" checked="checked"/> -    Allow iCloud documents and data + Allow iCloud documents and data @@ -3994,7 +3994,7 @@ data-default="true" checked="checked"/> -    Allow iCloud keychain + Allow iCloud keychain @@ -4008,7 +4008,7 @@ data-default="true" checked="checked"/> -    Allow managed apps to store data in iCloud + Allow managed apps to store data in iCloud @@ -4022,7 +4022,7 @@ data-default="true" checked="checked"/> -    Allow backup of enterprise books + Allow backup of enterprise books @@ -4036,7 +4036,7 @@ data-default="true" checked="checked"/> -    Allow enterprise books data sync + Allow enterprise books data sync @@ -4050,7 +4050,7 @@ data-default="true" checked="checked"/> -    Allow diagnostic submission + Allow diagnostic submission @@ -4064,7 +4064,7 @@ data-default="true" checked="checked"/> -    Allow explicit content + Allow explicit content @@ -4078,7 +4078,7 @@ data-default="true" checked="checked"/> -    Allow Find My Friends modification + Allow Find My Friends modification @@ -4092,7 +4092,7 @@ data-default="true" checked="checked"/> -    Allow fingerprint for unlock + Allow fingerprint for unlock @@ -4107,7 +4107,7 @@ checked="checked"/> -    Allow global background fetch when roaming + Allow global background fetch when roaming @@ -4121,7 +4121,7 @@ data-default="true" checked="checked"/> -    Show Control Center in lock screen + Show Control Center in lock screen @@ -4135,7 +4135,7 @@ data-default="true" checked="checked"/> -    Show Notifications Center in lock screen + Show Notifications Center in lock screen @@ -4149,7 +4149,7 @@ data-default="true" checked="checked"/> -    Show Today view in lock screen + Show Today view in lock screen @@ -4162,7 +4162,7 @@ data-key="restrictionsAllowHostPairing" data-default="true" checked="checked"/> -    Allow Host Pairing ( Supervised only ) + Allow Host Pairing ( Supervised only ) @@ -4176,7 +4176,7 @@ data-default="true" checked="checked"/> -    Allow documents from managed sources in unmanaged destinations + Allow documents from managed sources in unmanaged destinations @@ -4190,7 +4190,7 @@ data-default="true" checked="checked"/> -    Allow documents from unmanaged sources in managed destinations + Allow documents from unmanaged sources in managed destinations @@ -4203,7 +4203,7 @@ data-key="restrictionsAllowOTAPKIUpdates" data-default="true" checked="checked"/> -    Allow over-the-air PKI updates + Allow over-the-air PKI updates @@ -4217,7 +4217,7 @@ data-default="true" checked="checked"/> -    Show Passbook notifications in lock screen + Show Passbook notifications in lock screen @@ -4230,7 +4230,7 @@ data-key="restrictionsAllowPhotoStream" data-default="true" checked="checked"/> -    Allow Photo Stream + Allow Photo Stream @@ -4243,7 +4243,7 @@ data-key="restrictionsAllowSharedStream" data-default="true" checked="checked"/> -    Allow Shared Photo Stream + Allow Shared Photo Stream @@ -4258,7 +4258,7 @@ data-default="true" checked="checked"/> -    Allow user prompted profile installation + Allow user prompted profile installation @@ -4272,7 +4272,7 @@ data-default="true" checked="checked"/> -    Allow untrusted TLS prompt + Allow untrusted TLS prompt @@ -4286,7 +4286,7 @@ data-default="true" checked="checked"/> -    Allow video conferencing + Allow video conferencing @@ -4299,7 +4299,7 @@ data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/> -    Allow voice dialing + Allow voice dialing @@ -4313,7 +4313,7 @@ data-default="true" checked="checked"/> -    Force encrypting all backups + Force encrypting all backups @@ -4327,7 +4327,7 @@ data-default="false"/> -    Limit ad tracking + Limit ad tracking @@ -4342,7 +4342,7 @@ data-default="false"/> -    Force a pairing password for Airplay outgoing requests + Force a pairing password for Airplay outgoing requests @@ -4357,7 +4357,7 @@ data-default="false"/> -    Force a pairing password for Airplay incoming requests + Force a pairing password for Airplay incoming requests @@ -4371,7 +4371,7 @@ data-default="true" checked="checked"/> -    Allow Erase All Content And Settings ( Supervised only ) + Allow Erase All Content And Settings ( Supervised only ) @@ -4385,7 +4385,7 @@ data-default="true" checked="checked"/> -    Allow Spotlight Internet results ( Supervised only ) + Allow Spotlight Internet results ( Supervised only ) @@ -4399,7 +4399,7 @@ data-default="true" checked="checked"/> -    Allow Enable Restrictions option ( Supervised only ) + Allow Enable Restrictions option ( Supervised only ) @@ -4413,7 +4413,7 @@ data-default="true" checked="checked"/> -    Allow Activity Continuation + Allow Activity Continuation @@ -4427,7 +4427,7 @@ data-default="true" checked="checked"/> -    Allow definition lookup + Allow definition lookup @@ -4441,7 +4441,7 @@ data-default="true" checked="checked"/> -    Allow predictive keyboard ( Supervised only ) + Allow predictive keyboard ( Supervised only ) @@ -4455,7 +4455,7 @@ checked="checked"/> -    Allow keyboard auto-correction ( Supervised only ) + Allow keyboard auto-correction ( Supervised only ) @@ -4468,7 +4468,7 @@ data-key="restrictionsAllowSpellCheck" data-default="true" checked="checked"/> -    Allow keyboard spell-check ( Supervised only ) + Allow keyboard spell-check ( Supervised only ) @@ -4489,7 +4489,7 @@ checked="checked"/> -    Allow use of iTunes Store + Allow use of iTunes Store @@ -4503,7 +4503,7 @@ data-default="true" checked="checked"/> -    Allow use of Podcasts ( Supervised only ) + Allow use of Podcasts ( Supervised only ) @@ -4517,7 +4517,7 @@ data-default="true" checked="checked"/> -    Allow Safari + Allow Safari @@ -4532,7 +4532,7 @@ checked="checked"/> -    Enable AutoFill + Enable AutoFill @@ -4547,7 +4547,7 @@ data-default="false"/> -    Force Fraud warning + Force Fraud warning @@ -4562,7 +4562,7 @@ checked="checked"/> -    Enable Javascript + Enable Javascript @@ -4577,7 +4577,7 @@ checked="checked"/> -    Enable Pop-ups + Enable Pop-ups @@ -4611,7 +4611,7 @@ checked="checked"/> -    Allow YouTube + Allow YouTube @@ -4625,7 +4625,7 @@ data-default="true" checked="checked"/> -    Allow use of Game Center ( Supervised only ) + Allow use of Game Center ( Supervised only ) @@ -4639,7 +4639,7 @@ data-default="true" checked="checked"/> -    Allow multiplayer gaming + Allow multiplayer gaming @@ -4654,7 +4654,7 @@ checked="checked"/> -    Allow adding Game Center friends + Allow adding Game Center friends @@ -4679,12 +4679,12 @@
+ class="btn btn-secondary grid-input-add" data-click-event="add-form"> -   + Add Application Bundle ID @@ -4788,13 +4788,13 @@
- -   + Add Application 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-windows.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-windows.hbs index 9b900c633f..03be4923bd 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-windows.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-windows.hbs @@ -327,7 +327,7 @@
- +