Daniel Erez has uploaded a new change for review. Change subject: webadmin: remove "No volume type" constant ......................................................................
webadmin: remove "No volume type" constant Remove redundant "No volume type" constant and usage (no need to support it for now). Change-Id: Iac2f3136b08baf2ed05b4d7a5694ce32a95399d0 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 3 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/42447/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index ce9fd01..0503145 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -580,7 +580,6 @@ for (CinderVolumeType cinderVolumeType : cinderVolumeTypes) { volumeTypesNames.add(cinderVolumeType.getName()); } - volumeTypesNames.add(constants.noCinderVolumeType()); diskModel.getCinderVolumeType().setItems(volumeTypesNames); } }), storageDomain.getId()); 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 7699f46..95c6198 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 @@ -165,8 +165,7 @@ CinderDisk cinderDisk = (CinderDisk) getDisk(); cinderDisk.setSizeInGigabytes(getSize().getEntity()); cinderDisk.setvolumeFormat(VolumeFormat.RAW); - cinderDisk.setCinderVolumeType(getCinderVolumeType().getSelectedItem().equals( - constants.noCinderVolumeType()) ? "" : getCinderVolumeType().getSelectedItem()); //$NON-NLS-1$ + cinderDisk.setCinderVolumeType(getCinderVolumeType().getSelectedItem()); //$NON-NLS-1$ break; default: DiskImage diskImage = (DiskImage) getDisk(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index fabf483..1e190f7 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -2786,9 +2786,6 @@ @DefaultStringValue("Changing management network is only permitted via the 'Manage Cluster Networks' dialog.") String prohibitManagementNetworkChangeInEditClusterInfoMessage(); - @DefaultStringValue("No volume type") - String noCinderVolumeType(); - @DefaultStringValue("New Geo-Replication Session") String newGeoRepSessionTitle(); -- To view, visit https://gerrit.ovirt.org/42447 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac2f3136b08baf2ed05b4d7a5694ce32a95399d0 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
