Ravi Nori has uploaded a new change for review. Change subject: webadmin: New cluster dialog does not reflect data center compatibility version ......................................................................
webadmin: New cluster dialog does not reflect data center compatibility version The default compatibility version of the cluster is not the same as the DC one when creating a cluster via webadmin using the 'New DC Guide Me'. Change-Id: I52e189cb2a779edfdc87f8c3d58b8d703975ecf9 Bug-Url: https://bugzilla.redhat.com/1082321 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/26511/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index f95bbee..cced6f5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -1476,7 +1476,7 @@ // possible versions for new cluster (when editing cluster, this event won't occur) // are actually the possible versions for the data-center that the cluster is going // to be attached to. - StoragePool selectedDataCenter = getDataCenter().getSelectedItem(); + final StoragePool selectedDataCenter = getDataCenter().getSelectedItem(); if (selectedDataCenter == null) { return; @@ -1500,9 +1500,11 @@ ArrayList<Version> versions = (ArrayList<Version>) result; Version selectedVersion = clusterModel.getVersion().getSelectedItem(); clusterModel.getVersion().setItems(versions); - if (selectedVersion == null || !versions.contains(selectedVersion)) + if (selectedVersion == null || + !versions.contains(selectedVersion) || + selectedVersion.compareTo(selectedDataCenter.getcompatibility_version()) > 0) { - clusterModel.getVersion().setSelectedItem(Linq.selectHighestVersion(versions)); + clusterModel.getVersion().setSelectedItem(selectedDataCenter.getcompatibility_version()); } else if (clusterModel.getIsEdit()) { clusterModel.getVersion().setSelectedItem(Linq.firstOrDefault(versions, -- To view, visit http://gerrit.ovirt.org/26511 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52e189cb2a779edfdc87f8c3d58b8d703975ecf9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
