From 4c54ba434a7e717b9ca231519952eab3f335912c Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Thu, 6 Oct 2016 11:31:45 +0530
Subject: [PATCH 1/3] Fixing EMM-1688

---
 .../public/js/policy-create.js                  | 17 ++++++++++++++++-
 .../templates/hidden-operations-android.hbs     |  2 +-
 .../mdm.unit.policy.edit/public/js/edit.js      | 17 ++++++++++++++++-
 .../templates/hidden-operations-android.hbs     |  2 +-
 .../templates/hidden-operations-android.hbs     |  2 +-
 .../templates/hidden-operations-android.hbs     |  2 +-
 6 files changed, 36 insertions(+), 6 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 6ee4e6d822..ae8c031a81 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
@@ -355,7 +355,22 @@ validateStep["policy-profile"] = function () {
                     };
                     continueToCheckNextInputs = false;
                 }
-
+                // For the secure wifi types, it is required to have a password
+                var wifiTypeUIElement = $("#wifi-type");
+                var wifiType = wifiTypeUIElement.find("option:selected").val();
+                if (wifiTypeUIElement.is("input:checkbox")) {
+                    wifiType = wifiTypeUIElement.is(":checked").toString();
+                }
+                if (wifiType !== "none") {
+                    if (!$("#wifi-password").val()) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please provide a password to proceed.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
                 // at-last, if the value of continueToCheckNextInputs is still true
                 // this means that no error is found
                 if (continueToCheckNextInputs) {
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 f05d320f93..0756465ed4 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
@@ -879,7 +879,7 @@
                     </div>
                     <div class="wr-input-control" id="control-wifi-password" style="display:none;">
                         <label class="wr-input-label" for="wifi-password">
-                            Password
+                            Password*
                                 <span class="helper" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
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..5abf6b3f6c 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
@@ -382,7 +382,22 @@ validateStep["policy-profile"] = function () {
                     };
                     continueToCheckNextInputs = false;
                 }
-
+                // For the secure wifi types, it is required to have a password
+                var wifiTypeUIElement = $("#wifi-type");
+                var wifiType = wifiTypeUIElement.find("option:selected").val();
+                if (wifiTypeUIElement.is("input:checkbox")) {
+                    wifiType = wifiTypeUIElement.is(":checked").toString();
+                }
+                if (wifiType !== "none") {
+                    if (!$("#wifi-password").val()) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please provide a password to proceed.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
                 // at-last, if the value of continueToCheckNextInputs is still true
                 // this means that no error is found
                 if (continueToCheckNextInputs) {
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.hbs
index 520ddaf374..fbe1a8558a 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.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.hbs
@@ -903,7 +903,7 @@
                     </div>
                     <div class="wr-input-control" id="control-wifi-password" style="display:none;">
                         <label class="wr-input-label" for="wifi-password">
-                            Password
+                            Password*
                                 <span class="helper" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
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.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.hbs
index e75127b616..15df45f594 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.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.hbs
@@ -866,7 +866,7 @@
             </div>
             <div class="wr-input-control" id="control-wifi-password" style="display:none;">
                 <label class="wr-input-label" for="wifi-password">
-                    Password
+                    Password*
                                 <span class="helper" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
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.wizard/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.wizard/public/templates/hidden-operations-android.hbs
index 094f7f73fb..d1f8d67da2 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.wizard/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.wizard/public/templates/hidden-operations-android.hbs
@@ -335,7 +335,7 @@
                         </div>
                         <div class="wr-input-control">
                             <label class="wr-input-label" for="wifi-password">
-                                Password
+                                Password*
                                 <span class="helper" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>

From 51d6baf1d26c351f74be5ff84d843e7cbf305f91 Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Thu, 6 Oct 2016 11:48:23 +0530
Subject: [PATCH 2/3] Reformatting code

---
 .../units/mdm.unit.policy.create/public/js/policy-create.js    | 3 ++-
 .../devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js | 3 ++-
 2 files changed, 4 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.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 ae8c031a81..df2eb053a4 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
@@ -365,7 +365,8 @@ validateStep["policy-profile"] = function () {
                     if (!$("#wifi-password").val()) {
                         validationStatus = {
                             "error": true,
-                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please provide a password to proceed.",
+                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". " +
+                            "Please provide a password to proceed.",
                             "erroneousFeature": operation
                         };
                         continueToCheckNextInputs = false;
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 5abf6b3f6c..f2b5c05d26 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
@@ -392,7 +392,8 @@ validateStep["policy-profile"] = function () {
                     if (!$("#wifi-password").val()) {
                         validationStatus = {
                             "error": true,
-                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please provide a password to proceed.",
+                            "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please " +
+                            "provide a password to proceed.",
                             "erroneousFeature": operation
                         };
                         continueToCheckNextInputs = false;

From 10372a7f4e27efd007839151b3f6a6a3e1726ffa Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Thu, 6 Oct 2016 11:50:57 +0530
Subject: [PATCH 3/3] Changing the equality check

---
 .../app/units/mdm.unit.policy.create/public/js/policy-create.js | 2 +-
 .../devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js  | 2 +-
 2 files changed, 2 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.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 df2eb053a4..baa0d2be13 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
@@ -361,7 +361,7 @@ validateStep["policy-profile"] = function () {
                 if (wifiTypeUIElement.is("input:checkbox")) {
                     wifiType = wifiTypeUIElement.is(":checked").toString();
                 }
-                if (wifiType !== "none") {
+                if (wifiType != "none") {
                     if (!$("#wifi-password").val()) {
                         validationStatus = {
                             "error": true,
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 f2b5c05d26..23756d8a01 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
@@ -388,7 +388,7 @@ validateStep["policy-profile"] = function () {
                 if (wifiTypeUIElement.is("input:checkbox")) {
                     wifiType = wifiTypeUIElement.is(":checked").toString();
                 }
-                if (wifiType !== "none") {
+                if (wifiType != "none") {
                     if (!$("#wifi-password").val()) {
                         validationStatus = {
                             "error": true,