Roy Golan has uploaded a new change for review. Change subject: webadmin: filter out unsupported architectures ......................................................................
webadmin: filter out unsupported architectures Unsupported architecture is one that doesn't have a configured cpu to support it (its a vdc_options). Those archs are useless effectively so no point showing them in the dropdown. Change-Id: I7568e61882478f10bec614ddf514b32d23adc199 Signed-off-by: Roy Golan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/26105/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 71e3b1c..fc32eee 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 @@ -2,7 +2,9 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -1362,6 +1364,7 @@ ServerCpu oldSelectedCpu = clusterModel.getCPU().getSelectedItem(); clusterModel.getCPU().setItems(cpus); + initSupportedArchitectures(clusterModel); clusterModel.getCPU().setSelectedItem(oldSelectedCpu != null ? Linq.firstOrDefault(cpus, new Linq.ServerCpuPredicate(oldSelectedCpu.getCpuName())) : null); @@ -1372,9 +1375,7 @@ } if (clusterModel.getIsEdit()) { - if (canChangeArchitecture) { - getArchitecture().setItems(new ArrayList<ArchitectureType>(Arrays.asList(ArchitectureType.values()))); - } else { + if (!canChangeArchitecture) { getArchitecture().setItems(new ArrayList<ArchitectureType>(Arrays.asList(clusterModel.getEntity() .getArchitecture()))); } @@ -1388,12 +1389,20 @@ getArchitecture().setSelectedItem(getEntity().getArchitecture()); } } else { - getArchitecture().setItems(new ArrayList<ArchitectureType>(Arrays.asList(ArchitectureType.values()))); getArchitecture().setSelectedItem(ArchitectureType.undefined); } } + private void initSupportedArchitectures(ClusterModel clusterModel) { + Collection<ArchitectureType> archsWithSupportingCpus = new HashSet<ArchitectureType>(); + archsWithSupportingCpus.add(ArchitectureType.undefined); + for (ServerCpu cpu: clusterModel.getCPU().getItems()) { + archsWithSupportingCpus.add(cpu.getArchitecture()); + } + clusterModel.getArchitecture().setItems(archsWithSupportingCpus); + } + private void initCPU() { if (!isCPUinitialized && getIsEdit()) -- To view, visit http://gerrit.ovirt.org/26105 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7568e61882478f10bec614ddf514b32d23adc199 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
