Lior Vernia has uploaded a new change for review. Change subject: webadmin: Slightly amend checkbox header logic ......................................................................
webadmin: Slightly amend checkbox header logic Previously the logic only relied on enabled entries to determine whether the checkbox header should be checked or not, however this produced inconsistent results when all entries are disabled. Special attention is now paid to that case. Also, the logic for determining whether an entry is enabled seemed to be out-of-date and wasn't functioning properly. Change-Id: I2e7786d55c0f639c0e2f4af4685d125462724175 Bug-Url: https://bugzilla.redhat.com/1100292 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/31596/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java index e17acc7..8aae855 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java @@ -212,8 +212,9 @@ @Override public Boolean getValue() { + boolean allEntriesDisabled = !isEnabled(); for (ClusterNetworkModel clusterNetworkModel : getNetworksTableItems()) { - if (canEditRequired(clusterNetworkModel)) { + if (allEntriesDisabled || canEditRequired(clusterNetworkModel)) { if (!clusterNetworkModel.isRequired()) { return false; } @@ -225,7 +226,7 @@ @Override public boolean isEnabled() { for (ClusterNetworkModel clusterNetworkModel : getNetworksTableItems()) { - if (clusterNetworkModel.getIsChangable()) { + if (canEditRequired(clusterNetworkModel)) { return true; } } @@ -280,8 +281,9 @@ @Override public Boolean getValue() { + boolean allEntriesDisabled = !isEnabled(); for (ClusterNetworkModel clusterNetworkModel : getNetworksTableItems()) { - if (canEditAssign(clusterNetworkModel)) { + if (allEntriesDisabled || canEditAssign(clusterNetworkModel)) { if (!clusterNetworkModel.isAttached()) { return false; } @@ -293,7 +295,7 @@ @Override public boolean isEnabled() { for (ClusterNetworkModel clusterNetworkModel : getNetworksTableItems()) { - if (clusterNetworkModel.getIsChangable()) { + if (canEditAssign(clusterNetworkModel)) { return true; } } -- To view, visit http://gerrit.ovirt.org/31596 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e7786d55c0f639c0e2f4af4685d125462724175 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
