rajitha
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing platform filtering not working correctly

Browse Source 
Resolves https://github.com/wso2/product-iots/issues/1689
revert-70aa11f8
Rasika Perera 7 years ago
parent 8e3a298bb0
commit 49f97f02e8
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File

5
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
Unescape View File

@ -61,14 +61,15 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker/filters")) {
if (deviceTypesRes.status === "success") { if (deviceTypesRes.status === "success") {
var deviceTypes = deviceTypesRes["content"]["deviceTypes"]; var deviceTypes = deviceTypesRes["content"]["deviceTypes"];
for (i = 0; i < deviceTypes.length; i++) { for (i = 0; i < deviceTypes.length; i++) {
var deviceTypeLabel = deviceTypes[i]; var deviceTypeName = deviceTypes[i];
var deviceTypeLabel = deviceTypeName;
var configs = utility.getDeviceTypeConfig(deviceTypeLabel); var configs = utility.getDeviceTypeConfig(deviceTypeLabel);
if (configs) { if (configs) {
if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) { if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) {
deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]; deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
} }
} }
result.deviceTypes.push(deviceTypeLabel); result.deviceTypes.push({"name": deviceTypeLabel, "value": deviceTypeName});
} }
} }
//Adding policy compliance //Adding policy compliance

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
Unescape View File

@ -440,7 +440,7 @@ function loadDevices(searchType, searchParam) {
break; break;
case 4: case 4:
$(this).attr('data-grid-label', "Type"); $(this).attr('data-grid-label', "Type");
$(this).attr('data-search', getDeviceTypeLabel(deviceType)); $(this).attr('data-search', deviceType);
$(this).attr('data-display', getDeviceTypeLabel(deviceType)); $(this).attr('data-display', getDeviceTypeLabel(deviceType));
break; break;
case 5: case 5:

8
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
Unescape View File

@ -121,7 +121,13 @@ $.fn.datatables_extended = function (settings) {
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) { } 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 deviceTypes = cachedFilterRes.deviceTypes[i];
select.append('<option value="' + deviceTypes + '">' + deviceTypes + '</option>') var name = deviceTypes;
var value = deviceTypes;
if (deviceTypes.name && deviceTypes.value) {
name = deviceTypes.name;
value = deviceTypes.value;
}
select.append('<option value="' + value + '">' + name + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) { } 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++){

16
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
Unescape View File

@ -147,10 +147,6 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
} else { } else {
$("#operation-guide").addClass("hidden"); $("#operation-guide").addClass("hidden");
$("#operation-bar").removeClass("hidden"); $("#operation-bar").removeClass("hidden");
//noinspection JSUnresolvedFunction
if (deviceType && ownership) {
loadOperationBar(deviceType, ownership, operationBarModeConstants.BULK);
}
} }
} }
@ -162,10 +158,6 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
} else { } else {
$("#operation-guide").addClass("hidden"); $("#operation-guide").addClass("hidden");
$("#operation-bar").removeClass("hidden"); $("#operation-bar").removeClass("hidden");
//noinspection JSUnresolvedFunction
if (deviceType && ownership) {
loadOperationBar(deviceType, ownership, operationBarModeConstants.BULK);
}
} }
} }
}); });
@ -197,7 +189,13 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) { } 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 deviceTypes = cachedFilterRes.deviceTypes[i];
select.append('<option value="' + deviceTypes + '">' + deviceTypes + '</option>') var name = deviceTypes;
var value = deviceTypes;
if (deviceTypes.name && deviceTypes.value) {
name = deviceTypes.name;
value = deviceTypes.value;
}
select.append('<option value="' + value + '">' + name + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) { } 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++){

Write Preview
Loading…
Cancel
Save