aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxg353y <xg353y@intl.att.com>2019-05-10 15:15:27 +0200
committerxg353y <xg353y@intl.att.com>2019-05-13 11:22:48 +0200
commitfdf7909934efb0795489c8e04abaa1738830303d (patch)
treea5499c9efe672e05249b3c4db3b62f2bbc03cb92
parenta2f90ab5d88f9e91014e39be078e5c50a0d48e04 (diff)
Fix the Abatement issue
Fix the Abatement flag issue, remove the default checked setting and only set the abatement attribute value to true if it is selected. Issue-ID: CLAMP-378 Change-Id: I52b176297bc0042f6c83cfc30331ef9ca8830c98 Signed-off-by: xg353y <xg353y@intl.att.com>
-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