Daniel Erez has uploaded a new change for review. Change subject: webadmin: disks subtab - enable template disk removal ......................................................................
webadmin: disks subtab - enable template disk removal Enable template disk removal in disks sub-tab (under storage main-tab). Change-Id: Ieff2f7a999cc1baa34ae85c34a51c83e19600bed Bug-Url: https://bugzilla.redhat.com/892714 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/10817/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java index e0a8c4b..cf4657d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java @@ -5,7 +5,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.ImageStatus; -import org.ovirt.engine.core.common.businessentities.VmEntityType; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -121,10 +120,9 @@ private boolean isRemoveCommandAvailable(ArrayList<DiskImage> disks) { for (DiskImage disk : disks) { - boolean isTemplateDisk = disk.getVmEntityType() == VmEntityType.TEMPLATE; boolean isImageLocked = disk.getimageStatus() == ImageStatus.LOCKED; - if (isTemplateDisk || isImageLocked) { + if (isImageLocked) { return false; } } @@ -173,7 +171,7 @@ for (Object item : getSelectedItems()) { DiskImage disk = (DiskImage) item; - VdcActionParametersBase parameters = new RemoveDiskParameters(disk.getId()); + VdcActionParametersBase parameters = new RemoveDiskParameters(disk.getId(), getEntity().getId()); paramerterList.add(parameters); } -- To view, visit http://gerrit.ovirt.org/10817 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieff2f7a999cc1baa34ae85c34a51c83e19600bed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
