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 db81e47..1a01b25 100644 (file)
--- 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 0cf4c2e..f5a93cb 100644 (file)
--- 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