diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
index a0ddd0e294..146abcf0d0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
@@ -74,6 +74,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker/filters")) {
}
//Adding policy compliance
result.compliance = ["MONITOR", "ENFORCE", "WARN", "BLOCK"];
+ result.depStatus = ["Empty", "Assigned", "Pushed", "Removed"];
response["status"] = 200;
response["content"] = result;
response["contentType"] = "application/json";
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 d33cc3b4df..3914111525 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
@@ -109,17 +109,17 @@ $.fn.datatables_extended = function (settings) {
$(column).each(function () {
var i;
if (filterColumn.eq(column.index()).hasClass('data-status')) {
- for(i = 0; i < cachedFilterRes.status.length; i++){
+ for (i = 0; i < cachedFilterRes.status.length; i++) {
var status = cachedFilterRes.status[i];
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-ownership')) {
- for(i = 0; i < cachedFilterRes.ownership.length; i++){
+ for (i = 0; i < cachedFilterRes.ownership.length; i++) {
var ownership = cachedFilterRes.ownership[i];
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) {
- for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var deviceTypes = cachedFilterRes.deviceTypes[i];
var name = deviceTypes;
var value = deviceTypes;
@@ -130,10 +130,18 @@ $.fn.datatables_extended = function (settings) {
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) {
- for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var compliance = cachedFilterRes.compliance[i];
select.append('')
}
+ } else if (filterColumn.eq(column.index()).hasClass('data-dep-status')) {
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
+ var depStatus = cachedFilterRes.depStatus[i];
+ select.append('')
+ }
+ } else if (filterColumn.eq(column.index()).hasClass('data-boolean')) {
+ select.append('');
+ select.append('');
} else if ($(column.nodes()).attr('data-search')) {
var values = [];
column.nodes().unique().sort().each(function (d, j) {
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 85af438c1c..a560cc8220 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
@@ -177,17 +177,17 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
$(column).each(function () {
var i;
if (filterColumn.eq(column.index()).hasClass('data-status')) {
- for(i = 0; i < cachedFilterRes.status.length; i++){
+ for (i = 0; i < cachedFilterRes.status.length; i++) {
var status = cachedFilterRes.status[i];
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-ownership')) {
- for(i = 0; i < cachedFilterRes.ownership.length; i++){
+ for (i = 0; i < cachedFilterRes.ownership.length; i++) {
var ownership = cachedFilterRes.ownership[i];
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) {
- for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var deviceTypes = cachedFilterRes.deviceTypes[i];
var name = deviceTypes;
var value = deviceTypes;
@@ -198,10 +198,18 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
select.append('')
}
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) {
- for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var compliance = cachedFilterRes.compliance[i];
select.append('')
}
+ } else if (filterColumn.eq(column.index()).hasClass('data-dep-status')) {
+ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
+ var depStatus = cachedFilterRes.depStatus[i];
+ select.append('')
+ }
+ } else if (filterColumn.eq(column.index()).hasClass('data-boolean')) {
+ select.append('');
+ select.append('');
} else if ($(column.nodes()).attr('data-search')) {
var titles = [];
column.nodes().unique().sort().each(function (d, j) {