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

Message to display when a selected corrective policy is changed to general or deleted

Browse Source
This commit is contained in:
Saad Sahibjan 2019-10-19 12:18:53 +05:30
parent ec3f5afcb7
commit 8178a3cd8f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.corrective-action/public/templates/policy-corrective-action.hbs
View File

@ -20,5 +20,16 @@ Once this is supported for other device type the below condition can be removed.
</div> </div>
<br class="c-both"/> <br class="c-both"/>
</div> </div>
<div id="corrective-action-policy-id-missing-msg" class="hidden">
<br/>
<br/>
<span class="alert alert-info">
<strong>
<i class="icon fw fw-info"></i>
Corrective policy has been automatically changed to NONE since a previously selected corrective policy
has been updated to a GENERAL policy or it has been deleted.
</strong>
</span>
</div>
</div> </div>
{{/equal}} {{/equal}}

4
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

@ -305,7 +305,11 @@ stepForwardFrom["policy-profile"] = function () {
currentlyEffected.correctiveActions.length > 0) { currentlyEffected.correctiveActions.length > 0) {
currentlyEffected.correctiveActions.forEach(function (correctiveAction) { currentlyEffected.correctiveActions.forEach(function (correctiveAction) {
if ("POLICY" === correctiveAction.actionType) { if ("POLICY" === correctiveAction.actionType) {
if ($("#corrective-policy-input option[value=" + correctiveAction.policyId + "]").length > 0) {
$("#corrective-policy-input").val(correctiveAction.policyId); $("#corrective-policy-input").val(correctiveAction.policyId);
} else {
$("#corrective-action-policy-id-missing-msg").removeClass("hidden");
}
// returned from for each since currently only supported corrective action type is // returned from for each since currently only supported corrective action type is
// POLICY. // POLICY.
return true; return true;