Tal Nisan has uploaded a new change for review. Change subject: webadmin: New disk dialog does not validate the size value ......................................................................
webadmin: New disk dialog does not validate the size value The size field is defined as as an entity model of type long and so the integer validator does not validate it at all making it possible for numbers less than the minimum (including negative number and zero) as well as numbers higher than the maximum to appear as validated, this was fixed by replacing the entity model for size from type long to integer Change-Id: Ie8f6e52bc11b248fd7829261df7ec3626603e363 Signed-off-by: Tal Nisan <[email protected]> Bug-Url: https://bugzilla.redhat.com/1115471 --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 9 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/32203/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java index fbdc71c..216167b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java @@ -28,7 +28,7 @@ import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor; -import org.ovirt.engine.ui.common.widget.editor.generic.LongEntityModelTextBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.generic.IntegerEntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; @@ -90,7 +90,7 @@ @UiField @Path("size.entity") @WithElementId("size") - LongEntityModelTextBoxEditor sizeEditor; + IntegerEntityModelTextBoxEditor sizeEditor; @UiField @Path("sizeExtend.entity") diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml index 1b4af6b..152a276 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml @@ -103,7 +103,7 @@ <g:VerticalPanel ui:field="createDiskPanel" addStyleNames="{style.mainPanel}"> <g:HorizontalPanel> <g:VerticalPanel> - <ge:LongEntityModelTextBoxEditor ui:field="sizeEditor" addStyleNames="{style.boxEditor}"/> + <ge:IntegerEntityModelTextBoxEditor ui:field="sizeEditor" addStyleNames="{style.boxEditor}"/> <ge:StringEntityModelTextBoxEditor ui:field="sizeExtendEditor" addStyleNames="{style.boxEditor}"/> <ge:StringEntityModelTextBoxEditor ui:field="aliasEditor" addStyleNames="{style.boxEditor}"/> <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" addStyleNames="{style.boxEditor}"/> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java index f8039e3..9ee6911 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java @@ -160,7 +160,7 @@ driver.edit(object); diskAliasLabel.asValueBox().setValue(object.getAlias().getEntity()); - diskSizeLabel.asValueBox().setValue((new DiskSizeRenderer<Long>(SizeConverter.SizeUnit.GB).render( + diskSizeLabel.asValueBox().setValue((new DiskSizeRenderer<Integer>(SizeConverter.SizeUnit.GB).render( object.getSize().getEntity()))); object.getVolumeType().setSelectedItem(((DiskImage) object.getDisk()).getVolumeType()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index d2dcb3c..0da873a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -811,7 +811,7 @@ if (disk.getDiskStorageType() == DiskStorageType.IMAGE) { DiskImage diskImage = (DiskImage) disk; EntityModel sizeEntity = new EntityModel(); - sizeEntity.setEntity(diskImage.getSizeInGigabytes()); + sizeEntity.setEntity((int) diskImage.getSizeInGigabytes()); diskModel.setSize(sizeEntity); ListModel volumeList = new ListModel(); volumeList.setItems((diskImage.getVolumeType() == VolumeType.Preallocated ? diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java index fad3385..e0b80c3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java @@ -17,7 +17,7 @@ private Disk disk; private VM vm; - private EntityModel<Long> size; + private EntityModel<Integer> size; private EntityModel<String> alias; private EntityModel<String> description; private EntityModel<String> sourceStorageDomainName; @@ -47,11 +47,11 @@ this.vm = vm; } - public EntityModel<Long> getSize() { + public EntityModel<Integer> getSize() { return size; } - public void setSize(EntityModel<Long> size) { + public void setSize(EntityModel<Integer> size) { this.size = size; } @@ -136,7 +136,7 @@ } public DiskModel() { - setSize(new EntityModel<Long>()); + setSize(new EntityModel<Integer>()); setAlias(new EntityModel<String>()); setDescription(new EntityModel<String>()); setSourceStorageDomainName(new EntityModel<String>()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java index 484c921..70b1add 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java @@ -45,7 +45,7 @@ if (getDisk().getDiskStorageType() == DiskStorageType.IMAGE) { DiskImage diskImage = (DiskImage) getDisk(); - getSize().setEntity(diskImage.getSizeInGigabytes()); + getSize().setEntity((int) diskImage.getSizeInGigabytes()); getIsInternal().setEntity(true); getVolumeType().setSelectedItem(diskImage.getVolumeType()); setVolumeFormat(diskImage.getVolumeFormat()); @@ -65,7 +65,7 @@ }, getHash()), storageDomainId); } else { LunDisk lunDisk = (LunDisk) getDisk(); - getSize().setEntity((long) lunDisk.getLun().getDeviceSize()); + getSize().setEntity(lunDisk.getLun().getDeviceSize()); getIsInternal().setEntity(false); getSizeExtend().setIsAvailable(false); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java index b6609b4..76eda30 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java @@ -173,7 +173,7 @@ boolean isInternal = getIsInternal().getEntity(); if (isInternal) { DiskImage diskImage = (DiskImage) getDisk(); - diskImage.setSizeInGigabytes(Integer.parseInt(getSize().getEntity().toString())); + diskImage.setSizeInGigabytes(getSize().getEntity()); diskImage.setVolumeType(getVolumeType().getSelectedItem()); diskImage.setvolumeFormat(getVolumeFormat()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index bf3a4f0..038e327 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -247,7 +247,7 @@ if (disk.getDiskStorageType() == DiskStorageType.IMAGE) { DiskImage diskImage = (DiskImage) disk; EntityModel size = new EntityModel(); - size.setEntity(diskImage.getSizeInGigabytes()); + size.setEntity((int) diskImage.getSizeInGigabytes()); diskModel.setSize(size); ListModel volumes = new ListModel(); volumes.setItems((diskImage.getVolumeType() == VolumeType.Preallocated ? new ArrayList<VolumeType>(Arrays.asList(new VolumeType[] { VolumeType.Preallocated })) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 159762e..111049d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -548,7 +548,7 @@ DiskImage diskImage = (DiskImage) disk; EntityModel tempVar = new EntityModel(); - tempVar.setEntity(diskImage.getSizeInGigabytes()); + tempVar.setEntity((int) diskImage.getSizeInGigabytes()); diskModel.setSize(tempVar); ListModel tempVar2 = new ListModel(); tempVar2.setItems((diskImage.getVolumeType() == VolumeType.Preallocated ? new ArrayList<VolumeType>(Arrays.asList(new VolumeType[]{VolumeType.Preallocated})) -- To view, visit http://gerrit.ovirt.org/32203 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8f6e52bc11b248fd7829261df7ec3626603e363 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
