diff options
Diffstat (limited to 'src')
3 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java index 0041c589e..f47a6a08c 100644 --- a/src/main/java/org/onap/clamp/loop/Loop.java +++ b/src/main/java/org/onap/clamp/loop/Loop.java @@ -45,6 +45,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.OneToMany; +import javax.persistence.OrderBy; import javax.persistence.Table; import org.hibernate.annotations.Type; @@ -114,6 +115,7 @@ public class Loop implements Serializable { @Expose @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "loop") + @OrderBy("log_instant DESC") private Set<LoopLog> loopLogs = new HashSet<>(); public Loop() { 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..5e125165c 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="false" selected>False</option> + <option value="true">True</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 |