From 003ae9883bed90278b9def16ad90d98a86774cdf Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Thu, 25 Jan 2018 16:12:04 +0530
Subject: [PATCH] Fixing https://github.com/wso2/product-iots/issues/1629

---
 .../app/pages/cdmf.page.roles/roles.hbs       |  2 +-
 .../public/js/dataTables.extended.js          | 18 ++++++----
 .../dataTables.extended.serversidepaging.js   | 33 +++++++++++--------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
index 5476c743dd..98f85e8137 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
@@ -69,7 +69,7 @@
         </div>
 
         <div id="role-table" data-cloud={{isCloud}} data-role={{adminRole}}>
-            <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
+            <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view un-selectable"
                    id="role-grid">
                 <thead>
                 <tr class="sort-row">
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..8e09c31bb2 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
@@ -151,19 +151,24 @@ $.fn.datatables_extended = function(settings){
                 }
 
                 function getAdvanceToolBar(){
+                    var selectableBtnHtml = "";
                     if (!table.hasClass('no-toolbar')) {
                         if (table.hasClass('sorting-enabled')) {
-                            return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' +
-                                   '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
-                                   '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>' +
+                            if(!table.hasClass('un-selectable')){
+                                selectableBtnHtml = '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
+                                                    '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>';
+                            }
+                            return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' + selectableBtnHtml +
                                    '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
                                    '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
                                    '<li><button class="btn btn-default" data-toggle="dropdown"><i class="fw fw-sort"></i></button>' + dropdownmenu[0].outerHTML + '</li>' +
                                    '</ul>'
                         } else {
-                            return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' +
-                                   '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
-                                   '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>' +
+                            if(!table.hasClass('un-selectable')){
+                                selectableBtnHtml = '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
+                                                    '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>';
+                            }
+                            return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' + selectableBtnHtml +
                                    '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
                                    '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
                                    '</ul>'
@@ -236,6 +241,7 @@ $.fn.datatables_extended = function(settings){
                         thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
                     if(!$(button).hasClass('disabled')){
                         if($(button).html() == 'Select All') {
+                            $('.bulk-action-row').removeClass('hidden');
                             thisTable.api().rows().every(function () {
                                 $(this.node()).addClass(rowSelectedClass);
                                 $(button).html('Deselect All');
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..2458f4a30a 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
@@ -220,23 +220,27 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                 }
 
                 function getAdvanceToolBar() {
+                    var selectableBtnHtml = "";
                     if (table.hasClass('sorting-enabled')) {
-                        return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' +
-                            '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
-                            '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>' +
-                            '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
-                            '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
-                            '<li><button class="btn btn-default" data-toggle="dropdown"><i class="fw fw-sort"></i></button>' + dropdownmenu[0].outerHTML + '</li>' +
-                            '</ul>'
+                        if(!table.hasClass('un-selectable')){
+                            selectableBtnHtml = '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
+                                                '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>';
+                        }
+                        return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' + selectableBtnHtml +
+                               '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
+                               '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
+                               '<li><button class="btn btn-default" data-toggle="dropdown"><i class="fw fw-sort"></i></button>' + dropdownmenu[0].outerHTML + '</li>' +
+                               '</ul>';
                     } else {
-                        return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' +
-                            '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
-                            '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>' +
-                            '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
-                            '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
-                            '</ul>'
+                        if(!table.hasClass('un-selectable')){
+                            selectableBtnHtml = '<li><button data-click-event="toggle-selectable" class="btn btn-default btn-primary select-enable-btn">Select</li>' +
+                                                '<li><button data-click-event="toggle-selected" id="dt-select-all" class="btn btn-default btn-primary disabled">Select All</li>';
+                        }
+                        return '<ul class="nav nav-pills navbar-right remove-margin" role="tablist">' + selectableBtnHtml +
+                               '<li><button data-click-event="toggle-list-view" data-view="grid" class="btn btn-default"><i class="fw fw-grid"></i></button></li>' +
+                               '<li><button data-click-event="toggle-list-view" data-view="list" class="btn btn-default"><i class="fw fw-list"></i></button></li>' +
+                               '</ul>';
                     }
-                    ;
                 }
 
 
@@ -303,6 +307,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                         thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
                     if (!$(button).hasClass('disabled')) {
                         if ($(button).html() == 'Select All') {
+                            $('.bulk-action-row').removeClass('hidden');
                             thisTable.api().rows().every(function () {
                                 $(this.node()).addClass(rowSelectedClass);
                                 $(button).html('Deselect All');