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

Changing cdm-config file

Browse Source
This commit is contained in:
Supun94 2016-12-19 15:28:28 +05:30
parent 3d6f5ee64d
commit a831dc6a9a
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
* under the License.
*/
(function () {
var deviceId = $(".device-id");
var deviceIdentifier = deviceId.data("deviceid");
var deviceType = deviceId.data("type");
@ -136,13 +135,9 @@
function loadPolicyCompliance() {
var policyCompliance = $("#policy-view");
var policyComplianceTemplate = policyCompliance.attr("src");
console.log("deviceId:"+deviceId);
console.log("deviceType:"+deviceType);
var deviceId = policyCompliance.data("device-id");
var deviceType = policyCompliance.data("device-type");
var activePolicy = null;
console.log("deviceId:"+deviceId);
console.log("deviceType:"+deviceType);
$.template(
"policy-view",
@ -213,5 +208,3 @@
}
);
}
}());

56
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

@ -38,32 +38,40 @@ var displayPolicy = function (policyPayloadObj) {
}
$("#policy-status").html(policyStatus);
console.log(policyPayloadObj);
// if (policyPayloadObj.users.length > 0) {
// $("#policy-users").text(policyPayloadObj.users.toString().split(",").join(", "));
// } else {
// $("#users-row").addClass("hidden");
// }
// if (policyPayloadObj.deviceGroups.length > 0) {
// debugger;
// var deviceGroups = policyPayloadObj.deviceGroups;
// var assignedGroups = [];
// for (var index in deviceGroups) {
// if (deviceGroups.hasOwnProperty(index)) {
// assignedGroups.push(deviceGroups[index].name);
// }
// }
// $("#policy-groups").text(assignedGroups.toString().split(",").join(", "));
// } else {
// $("#policy-groups").text("NONE");
// }
if (policyPayloadObj.users == null) {
$("#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.roles.length > 0) {
// $("#policy-roles").text(policyPayloadObj.roles.toString().split(",").join(", "));
// } else {
// $("#roles-row").addClass("hidden");
// }
if (policyPayloadObj.deviceGroups == null) {
$("#policy-groups").text("NONE");
} else if (policyPayloadObj.deviceGroups.length > 0) {
debugger;
var deviceGroups = policyPayloadObj.deviceGroups;
var assignedGroups = [];
for (var index in deviceGroups) {
if (deviceGroups.hasOwnProperty(index)) {
assignedGroups.push(deviceGroups[index].name);
}
}
$("#policy-groups").text(assignedGroups.toString().split(",").join(", "));
} else {
$("#policy-groups").text("NONE");
}
if (policyPayloadObj.roles == null) {
$("#policy-roles").text("NONE");
}
else if (policyPayloadObj.roles.length > 0) {
$("#policy-roles").text(policyPayloadObj.roles.toString().split(",").join(", "));
} else {
$("#roles-row").addClass("hidden");
}
var deviceType = policy["platform"];
var policyOperationsTemplateSrc = context + '/public/cdmf.unit.device.type.' + deviceType +

2
components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
View File

@ -43,7 +43,7 @@
<minRetriesToMarkUnreachable>8</minRetriesToMarkUnreachable>
<minRetriesToMarkInactive>20</minRetriesToMarkInactive>
<!--<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>-->
<PolicyEvaluationPoint>Merged</PolicyEvaluationPoint>
<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
</PolicyConfiguration>
</ManagementRepository>
</DeviceMgtConfiguration>

2
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
View File

@ -46,7 +46,7 @@
<!--Set the policy evaluation point name-->
<!--Simple -> Simple policy evaluation point-->
<!--Merged -> Merged policy evaluation point -->
<PolicyEvaluationPoint>Merged</PolicyEvaluationPoint>
<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
<Platforms>
<Platform>android</Platform>
<Platform>ios</Platform>