Tomas Jelinek has uploaded a new change for review. Change subject: webadmin: new pool dialog should not contain Blank template ......................................................................
webadmin: new pool dialog should not contain Blank template This regression has been introduced by: 604d22dc036d1f5a4431c8247ce246d0c0a0c109 Fixed by moving back the code to filter out the Blank template from the new pool dialog. Change-Id: I6acdd3427e5c11b854bfd4c9c209c55da12b88a5 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1066646 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/24800/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java index 89daaf5..459d4d0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; +import java.util.ArrayList; import java.util.List; import org.ovirt.engine.core.common.businessentities.DisplayType; @@ -7,6 +8,7 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmTemplate; +import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -39,8 +41,7 @@ public void postDataCenterWithClusterSelectedItemChanged() { super.postDataCenterWithClusterSelectedItemChanged(); - final DataCenterWithCluster dataCenterWithCluster = - (DataCenterWithCluster) getModel().getDataCenterWithClustersList().getSelectedItem(); + final DataCenterWithCluster dataCenterWithCluster = getModel().getDataCenterWithClustersList().getSelectedItem(); StoragePool dataCenter = getModel().getSelectedDataCenter(); if (dataCenter == null) { return; @@ -57,7 +58,14 @@ AsyncDataProvider.filterTemplatesByArchitecture(baseTemplates, dataCenterWithCluster.getCluster().getArchitecture()); - getModel().getBaseTemplate().setItems(filteredTemplates); + List<VmTemplate> templatesWithoutBlank = new ArrayList<VmTemplate>(); + for (VmTemplate template : filteredTemplates) { + if (!template.getId().equals(Guid.Empty)) { + templatesWithoutBlank.add(template); + } + } + + getModel().getBaseTemplate().setItems(templatesWithoutBlank); } }), dataCenter.getId()); } -- To view, visit http://gerrit.ovirt.org/24800 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6acdd3427e5c11b854bfd4c9c209c55da12b88a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
