Arik Hadas has uploaded a new change for review.
Change subject: webadmin: cleanup in DisksAllocationModel
......................................................................
webadmin: cleanup in DisksAllocationModel
Rename DisksAllocationModel#isVolumeTypeAvailable to
isVolumeFormatAvailable as it controls the volume type and not the
volume format.
Change-Id: I1ed7e2b15cb38715b39250bab2ac65eb0caaa68a
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java
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/CloneVmFromSnapshotModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/38374/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java
index fc4b3fe..50a9281 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java
@@ -105,7 +105,7 @@
}
void updateColumnsAvailability(DisksAllocationModel model) {
- setShowVolumeType(model.getIsVolumeFormatAvailable());
+ setShowVolumeType(model.getIsVolumeTypeAvailable());
setShowQuota(model.getQuotaEnforcementType() !=
QuotaEnforcementTypeEnum.DISABLED);
}
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 0cfb916..d9c64f3 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
@@ -127,7 +127,7 @@
return quotaEnforcementType;
}
- private boolean isVolumeFormatAvailable;
+ private boolean isVolumeTypeAvailable;
private boolean isVolumeFormatChangable;
private boolean isAliasChangable;
private boolean isSourceStorageDomainAvailable;
@@ -255,7 +255,7 @@
for (DiskModel diskModel : disks) {
diskModel.getSourceStorageDomain().setIsAvailable(isSourceStorageDomainAvailable);
diskModel.getSourceStorageDomainName().setIsAvailable(isSourceStorageDomainNameAvailable);
- diskModel.getVolumeType().setIsAvailable(isVolumeFormatAvailable);
+ diskModel.getVolumeType().setIsAvailable(isVolumeTypeAvailable);
diskModel.getVolumeType().setIsChangable(isVolumeFormatChangable);
diskModel.getAlias().setIsChangable(isAliasChangable);
}
@@ -334,12 +334,12 @@
setIsValid(isModelValid);
}
- public void setIsVolumeFormatAvailable(boolean isVolumeFormatAvailable) {
- this.isVolumeFormatAvailable = isVolumeFormatAvailable;
+ public void setIsVolumeTypeAvailable(boolean isVolumeFormatAvailable) {
+ this.isVolumeTypeAvailable = isVolumeFormatAvailable;
}
- public boolean getIsVolumeFormatAvailable() {
- return isVolumeFormatAvailable;
+ public boolean getIsVolumeTypeAvailable() {
+ return isVolumeTypeAvailable;
}
public boolean getIsAliasChangable() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CloneVmFromSnapshotModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CloneVmFromSnapshotModelBehavior.java
index 05aeb1c..a0cea3f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CloneVmFromSnapshotModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CloneVmFromSnapshotModelBehavior.java
@@ -51,7 +51,7 @@
disks.add(Linq.diskToModel(diskImage));
}
getModel().setDisks(disks);
- getModel().getDisksAllocationModel().setIsVolumeFormatAvailable(true);
+ getModel().getDisksAllocationModel().setIsVolumeTypeAvailable(true);
getModel().getDisksAllocationModel().setIsVolumeFormatChangable(true);
updateIsDisksAvailable();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
index 3071dae..82afb92 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
@@ -207,7 +207,7 @@
boolean provisioning = getModel().getProvisioning().getEntity();
getModel().getProvisioningThin_IsSelected().setEntity(!provisioning);
getModel().getProvisioningClone_IsSelected().setEntity(provisioning);
- getModel().getDisksAllocationModel().setIsVolumeFormatAvailable(true);
+ getModel().getDisksAllocationModel().setIsVolumeTypeAvailable(true);
getModel().getDisksAllocationModel().setIsVolumeFormatChangable(provisioning);
getModel().getDisksAllocationModel().setIsAliasChangable(true);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
index ba1fd21..17d506c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
@@ -45,7 +45,7 @@
getModel().getIsSoundcardEnabled().setIsChangable(true);
- getModel().getDisksAllocationModel().setIsVolumeFormatAvailable(false);
+ getModel().getDisksAllocationModel().setIsVolumeTypeAvailable(false);
getModel().getDisksAllocationModel().setIsAliasChangable(true);
getModel().getProvisioning().setIsAvailable(false);
--
To view, visit https://gerrit.ovirt.org/38374
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ed7e2b15cb38715b39250bab2ac65eb0caaa68a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
