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

Merge branch 'master' into 'master'

Browse Source 
Fix corrective policy UI loading intermittent issue

See merge request entgra/carbon-device-mgt!373
This commit is contained in:
Saad Sahibjan 2019-11-01 14:20:21 +00:00
commit 495534ce5f
2 changed files with 48 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ var validateInline = {};
var clearInline = {}; var clearInline = {};
var validateStep = {}; var validateStep = {};
var hasPolicyProfileScript = false; var hasPolicyProfileScript = false;
var isCorrectiveActionProfileAdded = false;
var enableInlineError = function (inputField, errorMsg, errorSign) { var enableInlineError = function (inputField, errorMsg, errorSign) {
var fieldIdentifier = "#" + inputField; var fieldIdentifier = "#" + inputField;
@ -224,7 +223,6 @@ stepForwardFrom["policy-profile"] = function () {
} }
// add policy correction action page // add policy correction action page
if (!isCorrectiveActionProfileAdded) {
var policyCorrectiveActionTemplateSrc = var policyCorrectiveActionTemplateSrc =
"/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs"; "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
var policyCorrectiveActionScriptSrc = var policyCorrectiveActionScriptSrc =
@ -239,16 +237,12 @@ stepForwardFrom["policy-profile"] = function () {
"correctivePolicies": $("#logged-in-user").data("corrective-policies") "correctivePolicies": $("#logged-in-user").data("corrective-policies")
} }
); );
$("#select-general-policy-type").html(content) $("#select-general-policy-type").html(content);
});
var script = document.createElement('script'); var script = document.createElement('script');
script.type = 'text/javascript'; script.type = 'text/javascript';
script.src = context + policyCorrectiveActionScriptSrc; script.src = context + policyCorrectiveActionScriptSrc;
document.head.append(script); document.head.append(script);
});
isCorrectiveActionProfileAdded = true
}
// updating next-page wizard title with selected platform // updating next-page wizard title with selected platform
$("#policy-type-page-wizard-title").text("ADD " + policy["platform"] + " POLICY"); $("#policy-type-page-wizard-title").text("ADD " + policy["platform"] + " POLICY");
@ -645,8 +639,6 @@ $(document).ready(function () {
} }
}); });
isCorrectiveActionProfileAdded = false;
$('input[type=radio][name=policy-type-radio-btn]').change(function() { $('input[type=radio][name=policy-type-radio-btn]').change(function() {
if ($(this).val() === "CORRECTIVE") { if ($(this).val() === "CORRECTIVE") {
$("#select-general-policy-type").addClass("hidden"); $("#select-general-policy-type").addClass("hidden");

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

@ -42,7 +42,6 @@ var currentlyEffected = {};
var validateInline = {}; var validateInline = {};
var clearInline = {}; var clearInline = {};
var hasPolicyProfileScript = false; var hasPolicyProfileScript = false;
var isCorrectiveActionProfileAdded = false;
var enableInlineError = function (inputField, errorMsg, errorSign) { var enableInlineError = function (inputField, errorMsg, errorSign) {
var fieldIdentifier = "#" + inputField; var fieldIdentifier = "#" + inputField;
@ -285,7 +284,6 @@ stepForwardFrom["policy-profile"] = function () {
$("input[name=policy-type-radio-btn][value=" + policyType + "]").prop("checked", true).trigger('change'); $("input[name=policy-type-radio-btn][value=" + policyType + "]").prop("checked", true).trigger('change');
// add policy correction action page // add policy correction action page
if (!isCorrectiveActionProfileAdded) {
var policyCorrectiveActionTemplateSrc = var policyCorrectiveActionTemplateSrc =
"/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs"; "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
var policyCorrectiveActionScriptSrc = var policyCorrectiveActionScriptSrc =
@ -316,15 +314,11 @@ stepForwardFrom["policy-profile"] = function () {
} }
}); });
} }
});
var script = document.createElement('script'); var script = document.createElement('script');
script.type = 'text/javascript'; script.type = 'text/javascript';
script.src = context + policyCorrectiveActionScriptSrc; script.src = context + policyCorrectiveActionScriptSrc;
document.head.prepend(script); document.head.prepend(script);
});
isCorrectiveActionProfileAdded = true;
}
$(".policy-type-loading-corrective-actions").addClass("hidden"); $(".policy-type-loading-corrective-actions").addClass("hidden");
@ -768,8 +762,6 @@ $(document).ready(function () {
$("#policy-profile-wizard-steps").html($(".wr-steps").html()); $("#policy-profile-wizard-steps").html($(".wr-steps").html());
isCorrectiveActionProfileAdded = false;
$('input[type=radio][name=policy-type-radio-btn]').change(function() { $('input[type=radio][name=policy-type-radio-btn]').change(function() {
if ($(this).val() === "CORRECTIVE") { if ($(this).val() === "CORRECTIVE") {
$("#select-general-policy-type").addClass("hidden"); $("#select-general-policy-type").addClass("hidden");