From 13b3f0999d669451a9c648fa09dae1037313700e Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Mon, 24 Jul 2017 14:43:18 +0530
Subject: [PATCH 1/2] Fixing the issue where bulk actions are shown without
 bulk action getting triggered in cloud

---
 .../devicemgt/app/pages/cdmf.page.devices/devices.hbs     | 2 +-
 .../devicemgt/app/pages/cdmf.page.policies/policies.hbs   | 2 +-
 .../devicemgt/app/pages/cdmf.page.users/users.hbs         | 2 +-
 .../public/js/dataTables.extended.serversidepaging.js     | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index 55f80edd0a..589e2ab3ab 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -176,7 +176,7 @@
                                 <th data-for="By Ownership" class="select-filter"></th>
                                 <th class="no-sort"></th>
                             </tr>
-                            <tr class="bulk-action-row">
+                            <tr class="bulk-action-row hidden">
                                 <th colspan="7">
                                     <ul class="tiles">
                                         {{#unless group}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
index fcce815fc0..77ec4d34a6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
@@ -138,7 +138,7 @@
                 <th data-for="By Status" class="select-filter"></th>
                 <th class="no-sort"></th>
             </tr>
-            <tr class="bulk-action-row">
+            <tr class="bulk-action-row hidden">
                 <th colspan="9">
                     <ul class="tiles">
                         {{#if removePermitted}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
index 85f2241db3..26f3f97444 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
@@ -77,7 +77,7 @@
             <tr class="sort-row">
                 <th>By Username</th>
             </tr>
-            <tr class="bulk-action-row">
+            <tr class="bulk-action-row hidden">
                 <th colspan="3">
                     <ul class="tiles">
                         <li class="square">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
index e98cf7bebb..a8cd244328 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
@@ -285,6 +285,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                         $(document).off('click', '.viewEnabledIcon');
                         //--- End of EMM related codes
                     } else if ($(button).html() == 'Cancel') {
+                        $('.bulk-action-row').addClass('hidden');
                         thisTable.removeClass("table-selectable");
                         $(button).addClass("active").html('Select');
                         $(button).parent().next().children().addClass("disabled");
@@ -322,6 +323,13 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                 $('body').on('click', '[data-type=selectable]', function () {
                     var rowSelectedClass = 'DTTT_selected selected';
                     $(this).toggleClass(rowSelectedClass);
+
+                    if($('.table-selectable .DTTT_selected').length > 0){
+                        $('.bulk-action-row').removeClass('hidden');
+                    }else{
+                        $('.bulk-action-row').addClass('hidden');
+                    }
+
                     var button = this,
                         thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
 

From 9a4807b069aaa89192b468d6ca11a9899095b692 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Mon, 24 Jul 2017 15:52:54 +0530
Subject: [PATCH 2/2] Changed code structuring.

---
 .../public/js/dataTables.extended.serversidepaging.js       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
index a8cd244328..c79bd99516 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
@@ -323,13 +323,11 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                 $('body').on('click', '[data-type=selectable]', function () {
                     var rowSelectedClass = 'DTTT_selected selected';
                     $(this).toggleClass(rowSelectedClass);
-
-                    if($('.table-selectable .DTTT_selected').length > 0){
+                    if ($('.table-selectable .DTTT_selected').length > 0) {
                         $('.bulk-action-row').removeClass('hidden');
-                    }else{
+                    } else {
                         $('.bulk-action-row').addClass('hidden');
                     }
-
                     var button = this,
                         thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();