community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix policy view interface loading issue (#1206)

Browse Source 
* Fix policy view interface loading issue

When the policy view page is loaded some of the variables of the policyPayloadObj becomes undefined or null.  This commit checks for the empty and undefined variables.

Relates wso2/product-iots#1681

* Fix formatting issues
This commit is contained in:
Madawa Soysa 2018-03-03 12:09:54 +05:30 committed by Madhawa Perera
parent 0bbdf7a65f
commit e617273c3d
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js
View File

@ -41,8 +41,7 @@ var displayPolicy = function (policyPayloadObj) {
if (!policyPayloadObj.users) {
$("#policy-users").text("NONE");
}
else if (policyPayloadObj.users.length > 0) {
} else if (policyPayloadObj.users.length > 0) {
$("#policy-users").text(policyPayloadObj.users.toString().split(",").join(", "));
} else {
$("#users-row").addClass("hidden");
@ -59,14 +58,11 @@ var displayPolicy = function (policyPayloadObj) {
}
}
$("#policy-groups").text(assignedGroups.toString().split(",").join(", "));
} else {
$("#policy-groups").text("NONE");
}
if (!policyPayloadObj.roles) {
$("#policy-roles").text("NONE");
}
else if (policyPayloadObj.roles.length > 0) {
} else if (policyPayloadObj.roles.length > 0) {
$("#policy-roles").text(policyPayloadObj.roles.toString().split(",").join(", "));
} else {
$("#roles-row").addClass("hidden");

17
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js
View File

@ -41,12 +41,17 @@ var displayPolicy = function (policyPayloadObj) {
$("#policy-status").html(policyStatus);
if (policyPayloadObj.users.length > 0) {
if (!policyPayloadObj.users) {
$("#policy-users").text("NONE");
} else if (policyPayloadObj.users.length > 0) {
$("#policy-users").text(policyPayloadObj.users.toString().split(",").join(", "));
} else {
$("#users-row").addClass("hidden");
}
if (policyPayloadObj.deviceGroups.length > 0) {
if (!policyPayloadObj.deviceGroups) {
$("#policy-groups").text("NONE");
} else if (policyPayloadObj.deviceGroups.length > 0) {
var deviceGroups = policyPayloadObj.deviceGroups;
var assignedGroups = [];
for (var index in deviceGroups) {
@ -55,14 +60,12 @@ var displayPolicy = function (policyPayloadObj) {
}
}
$("#policy-groups").text(assignedGroups.toString().split(",").join(", "));
} else {
$("#policy-groups").text("NONE");
}
if (policyPayloadObj.roles.length > 0) {
$("#policy-roles").text(policyPayloadObj.roles.toString().split(",").join(", "));
} else {
if (!policyPayloadObj.roles) {
$("#roles-row").addClass("hidden");
} else if (policyPayloadObj.roles.length > 0) {
$("#policy-roles").text(policyPayloadObj.roles.toString().split(",").join(", "));
}
var policyId = policyPayloadObj["id"];