From bc3f64a77a15a9c96ec6c1f7246f6a8dcac7aae4 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 18 May 2016 11:24:38 +0530
Subject: [PATCH] Fixing IOTS-114: the user is unable to deselect a child node
 permissions

---
 .../cdmf.unit.role.edit.permission/permission.hbs  | 14 --------------
 .../public/js/bottomJs.js                          |  8 ++------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
index 05f1275da2..8072c314d9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
@@ -61,20 +61,6 @@
                     </a>
                 </div>
             </div>
-            <div id="child-deselect-error-content" class="hide">
-                                <div class="content">
-                                    <div class="row">
-                                        <div class="col-lg-5 col-md-6 col-centered">
-                                            <h3>Can't deselect child permissions when parent permission is selected.</h3>
-                                            <div class="buttons">
-                                                <a href="#" id="child-deselect-error-link" class="btn-operations">
-                                                    Ok
-                                                </a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                         </div>
             <!-- /content -->
         </div>
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js
index aab53ca9ec..2989ce3924 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js
@@ -117,12 +117,8 @@ $(document).ready(function () {
                     $("#permissionList li input").click(function() {
                         var parentInput = $(this).parents("ul:eq(1) > li").find('input:eq(0)');
                         if(parentInput && parentInput.is(':checked')){
-                            $(modalPopupContent).html($('#child-deselect-error-content').html());
-                            showPopup();
-                            $("a#child-deselect-error-link").click(function () {
-                                hidePopup();
-                            });
-                            return false;
+                            parentInput.prop('checked', false);
+                            return true;
                         }
                     });
                     $('#permissionList').tree_view();