Amit Aviram has uploaded a new change for review. Change subject: webadmin: Template's empty string as a disk alias UI fix. ......................................................................
webadmin: Template's empty string as a disk alias UI fix. While making a new template based on a VM, providing the template's allocated disks's alias as an empty string is now disabled ALSO BY UI. the user should not be able to create a template with disks that have an empty aliases- this bug has already been fixed at the BACKEND, this current patch prevents the user from giving an empty alias at UI level. Change-Id: I246063773e423f1e34ace3acd3f3884b282597e7 Bug-Url: https://bugzilla.redhat.com/1110304 Signed-off-by: Amit Aviram <aavi...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/34606/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java index c9a73e3..a2d1a38 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java @@ -319,16 +319,19 @@ return; } + boolean isModelValid = true; for (DiskModel diskModel : getDisks()) { ListModel diskStorageDomains = diskModel.getStorageDomain(); if (!diskStorageDomains.getItems().iterator().hasNext() || diskStorageDomains.getSelectedItem() == null) { diskModel.getStorageDomain().getInvalidityReasons().add( constants.storageDomainMustBeSpecifiedInvalidReason()); diskModel.getStorageDomain().setIsValid(false); - setIsValid(false); + isModelValid = false; } diskModel.getAlias().validateEntity(new IValidation[] { new NotEmptyValidation(), new I18NNameValidation() }); + isModelValid = isModelValid && diskModel.getAlias().getIsValid(); } + setIsValid(isModelValid); } public void setIsVolumeFormatAvailable(boolean isVolumeFormatAvailable) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index dda5869..250f92a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -2759,7 +2759,8 @@ setIsHostTabValid(getIsHostTabValid() && getMigrationDowntime().getIsValid()); - setIsAllocationTabValid(getIsAllocationTabValid() && getCpuSharesAmount().getIsValid()); + boolean diskAliasesValid = getDisksAllocationModel().getIsValid(); + setIsAllocationTabValid(getIsAllocationTabValid() && getCpuSharesAmount().getIsValid() && diskAliasesValid); setIsBootSequenceTabValid(getCdImage().getIsValid() && getKernel_path().getIsValid()); boolean vmInitIsValid = getVmInitModel().validate(); setIsFirstRunTabValid(vmInitIsValid); -- To view, visit http://gerrit.ovirt.org/34606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I246063773e423f1e34ace3acd3f3884b282597e7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
