Martin Beták has uploaded a new change for review. Change subject: engine: Fixed ChangeCD dialog on inactive ISO domain ......................................................................
engine: Fixed ChangeCD dialog on inactive ISO domain ChangeCD dialog no longer displays blank line which upon selection caused NullPointerException. Now the only available option when the ISO domain is unavailable is 'Eject'. Change-Id: I257e5f5fcfec0ab5c24dfaefa5c7f9330079141b Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=907506 Signed-off-by: Martin Betak <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 2 files changed, 6 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/12879/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 4771698..cf0b29e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -22,6 +22,7 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.Quota; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; @@ -32,7 +33,6 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters; @@ -128,6 +128,7 @@ private UICommand privateEditCommand; + @Override public UICommand getEditCommand() { return privateEditCommand; @@ -1200,11 +1201,8 @@ UserPortalListModel userPortalListModel = (UserPortalListModel) model1; AttachCdModel _attachCdModel = (AttachCdModel) userPortalListModel.getWindow(); List<String> images = (List<String>) result; - if (images.size() > 0) - { - images.add(0, ConsoleModel.EjectLabel); - _attachCdModel.getIsoImage().setItems(images); - } + images.add(0, ConsoleModel.EjectLabel); + _attachCdModel.getIsoImage().setItems(images); if (_attachCdModel.getIsoImage().getIsChangable()) { _attachCdModel.getIsoImage().setSelectedItem(Linq.FirstOrDefault(images)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 9b974b6..71b1460 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2273,11 +2273,8 @@ VmListModel vmListModel2 = (VmListModel) model; AttachCdModel _attachCdModel = (AttachCdModel) vmListModel2.getWindow(); ArrayList<String> images = (ArrayList<String>) result; - if (images.size() > 0) - { - images.add(0, ConsoleModel.EjectLabel); - _attachCdModel.getIsoImage().setItems(images); - } + images.add(0, ConsoleModel.EjectLabel); + _attachCdModel.getIsoImage().setItems(images); if (_attachCdModel.getIsoImage().getIsChangable()) { _attachCdModel.getIsoImage().setSelectedItem(Linq.FirstOrDefault(images)); -- To view, visit http://gerrit.ovirt.org/12879 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I257e5f5fcfec0ab5c24dfaefa5c7f9330079141b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Beták <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
