From b56c92620344ad7b775272a07f6788d4eb88459f Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 25 Jan 2018 17:12:25 +0530 Subject: [PATCH] Fix git issue https://github.com/wso2/product-iots/issues/1629 Fixes wso2/product-iots#1629 --- .../public/js/dataTables.extended.js | 2 ++ .../public/js/dataTables.extended.serversidepaging.js | 2 ++ 2 files changed, 4 insertions(+) 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.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.js index 31400687bc..9b533b3e0d 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.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.js @@ -239,12 +239,14 @@ $.fn.datatables_extended = function(settings){ thisTable.api().rows().every(function () { $(this.node()).addClass(rowSelectedClass); $(button).html('Deselect All'); + $('.bulk-action-row').addClass('hidden'); }); } else if($(button).html() == 'Deselect All') { thisTable.api().rows().every(function () { $(this.node()).removeClass(rowSelectedClass); $(button).html('Select All'); + $('.bulk-action-row').removeClass('hidden'); }); } } 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 c79bd99516..02505d97ca 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 @@ -306,12 +306,14 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter thisTable.api().rows().every(function () { $(this.node()).addClass(rowSelectedClass); $(button).html('Deselect All'); + $('.bulk-action-row').addClass('hidden'); }); } else if ($(button).html() == 'Deselect All') { thisTable.api().rows().every(function () { $(this.node()).removeClass(rowSelectedClass); $(button).html('Select All'); + $('.bulk-action-row').removeClass('hidden'); }); } }