Daniel Erez has uploaded a new change for review. Change subject: webadmin: PoolModelBehavior fix disk availability ......................................................................
webadmin: PoolModelBehavior fix disk availability * Removed a redundant call to setIsDisksAvailable, 'setIsDisksAvailable' is already set correctly on InitDisks (causes an NPE in DisksAllocationModel -> sortDisks). * UpdateIsDisksAvailable -> added the same logic as in NewVmModelBehavior. Change-Id: I888147a7b61c49de7eb4ba9426f9e933113cb04b Bug-Url: https://bugzilla.redhat.com/928410 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/14016/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.ui.xml index b71267b..c563a1e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.ui.xml @@ -43,7 +43,7 @@ <g:center> <g:SimplePanel ui:field="snapshotsTableContainer"/> </g:center> - <g:east size="660"> + <g:east size="650"> <g:SimplePanel ui:field="snapshotInfoContainer"/> </g:east> </g:SplitLayoutPanel> 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 615b9c0..4dbc85f 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 @@ -174,8 +174,6 @@ getModel().getKernel_parameters().setEntity(vmBase.getKernelParams()); getModel().getInitrd_path().setEntity(vmBase.getInitrdUrl()); - getModel().setIsDisksAvailable(true); - if (!vmBase.getId().equals(Guid.Empty)) { getModel().getStorageDomain().setIsChangable(true); @@ -296,6 +294,8 @@ @Override public void UpdateIsDisksAvailable() { + getModel().setIsDisksAvailable(getModel().getDisks() != null + && getModel().getProvisioning().getIsChangable()); } @Override -- To view, visit http://gerrit.ovirt.org/14016 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I888147a7b61c49de7eb4ba9426f9e933113cb04b 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
