Changing cdm-config file

revert-70aa11f8
Supun94 8 years ago
parent 3d6f5ee64d
commit a831dc6a9a

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

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

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

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

Loading…
Cancel
Save