From: Sébastien Determe <sebastien.determe@intl.att.com>
Date: Mon, 13 May 2019 12:02:52 +0000 (+0000)
Subject: Merge "Fix the Abatement issue"
X-Git-Tag: 4.0.2~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=36d6db0d7b7cb2f8f1105b1a393d1f5f1f575564;hp=2fcc09ac09dbc13a5a346fd31d0f70cdc54125fc;p=clamp.git

Merge "Fix the Abatement issue"
---

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 db81e476..1a01b250 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 0cf4c2e3..f5a93cb9 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