summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Determe <sebastien.determe@intl.att.com>2019-05-13 12:02:52 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-13 12:02:52 +0000
commit36d6db0d7b7cb2f8f1105b1a393d1f5f1f575564 (patch)
treed7b4868ce85959bdf62feffb40b45d316e4e6528
parent2fcc09ac09dbc13a5a346fd31d0f70cdc54125fc (diff)
parentfdf7909934efb0795489c8e04abaa1738830303d (diff)
Merge "Fix the Abatement issue"
-rw-r--r--src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html6
-rw-r--r--src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
index db81e4760..1a01b250e 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
@@ -125,8 +125,10 @@ label {
<label for="abatement" class="col-sm-2">Abatement</label>
<div class="col-sm-3" style="padding: 0px;">
- <input type="checkbox" id="abatement" name="abatement"
- checked="true" class="form-control">
+ <select class="form-control" id="abatement" name="abatement">
+ <option value="0" selected>No</option>
+ <option value="1">Yes</option>
+ </select>
</div>
</div>
<div class="form-group clearfix row">
diff --git a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
index 0cf4c2e3a..f5a93cb90 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js
@@ -179,7 +179,6 @@ app
console.log("load properties to op policy");
// Set the header
$.each($('#operationalPolicyHeaderForm').find('.form-control'), function() {
-
$(this).val(allPolicies['operational_policy']['controlLoop'][this.id]);
});
// Set the sub-policies