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 5476c743dd1..98f85e8137d 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 @@
-
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 ed736c01c68..c8164df746e 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
@@ -154,22 +154,27 @@ $.fn.datatables_extended = function (settings) {
}
function getAdvanceToolBar() {
+ var selectableBtnHtml = "";
if (!table.hasClass('no-toolbar')) {
if (table.hasClass('sorting-enabled')) {
- return '' +
- '' +
- '' +
- '' +
- '' +
- '- ' + dropdownmenu[0].outerHTML + '
' +
- '
'
+ if(!table.hasClass('un-selectable')) {
+ selectableBtnHtml = '' +
+ '';
+ }
+ return '' + selectableBtnHtml +
+ '' +
+ '' +
+ '- ' + dropdownmenu[0].outerHTML + '
' +
+ '
'
} else {
- return '' +
- '' +
- '' +
- '' +
- '' +
- '
'
+ if(!table.hasClass('un-selectable')) {
+ selectableBtnHtml = '' +
+ '';
+ }
+ return '' + selectableBtnHtml +
+ '' +
+ '' +
+ '
'
}
} else {
return '';
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 836bef71cb1..32009a3cc19 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
@@ -223,23 +223,27 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
}
function getAdvanceToolBar() {
+ var selectableBtnHtml = "";
if (table.hasClass('sorting-enabled')) {
- return '' +
- '' +
- '' +
- '' +
- '' +
- '- ' + dropdownmenu[0].outerHTML + '
' +
- '
'
+ if(!table.hasClass('un-selectable')){
+ selectableBtnHtml = '' +
+ '';
+ }
+ return '' + selectableBtnHtml +
+ '' +
+ '' +
+ '- ' + dropdownmenu[0].outerHTML + '
' +
+ '
';
} else {
- return '' +
- '' +
- '' +
- '' +
- '' +
- '
'
+ if(!table.hasClass('un-selectable')){
+ selectableBtnHtml = '' +
+ '';
+ }
+ return '' + selectableBtnHtml +
+ '' +
+ '' +
+ '
';
}
- ;
}