Daniel Erez has uploaded a new change for review. Change subject: webadmin: VM GuideMe - update dialog on attach disk ......................................................................
webadmin: VM GuideMe - update dialog on attach disk VM Guide Me: Update 'Configure Virtual Disks' button to 'Add another Virtual Disk' after attaching a disk. Change-Id: I21f7f8b7cd0733b2b2fc06cbe7cc39a9a42b755e Bug-Url: https://bugzilla.redhat.com/1026308 Signed-off-by: Daniel Erez <[email protected]> --- 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/NewGuideDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java 3 files changed, 19 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/21090/1 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 76c6131..fae2b65 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 @@ -73,6 +73,7 @@ NewDiskModel diskModel = (NewDiskModel) result.getState(); diskModel.stopProgress(); diskModel.cancel(); + postSave(); } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewGuideDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewGuideDiskModel.java index 9e8398a..896740b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewGuideDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewGuideDiskModel.java @@ -11,6 +11,6 @@ @Override protected void postSave() { super.postSave(); - sourceModel.updateOptions(); + sourceModel.updateOptions(true); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java index 09d5259..dff7b07 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java @@ -32,14 +32,28 @@ protected void onEntityChanged() { super.onEntityChanged(); - updateOptions(); + + if (getEntity() != null) { + startProgress(null); + AsyncDataProvider.getVmDiskList(new AsyncQuery(this, new INewAsyncCallback() { + @Override + public void onSuccess(Object target, Object returnValue) { + Collection<Disk> disks = (Collection<Disk>) returnValue; + updateOptions(!disks.isEmpty()); + } + }), getEntity().getId()); + } } - private void updateOptionsPostData(Collection<Disk> disks) { + public void updateOptions(boolean containsDisks) { + getCompulsoryActions().clear(); + getOptionalActions().clear(); + startProgress(null); + // Add disk action. UICommand addDiskAction = new UICommand("AddDisk", this); //$NON-NLS-1$ - if (disks.isEmpty()) + if (!containsDisks) { addDiskAction.setTitle(VmConfigureVirtualDisksAction); getCompulsoryActions().add(addDiskAction); @@ -51,25 +65,6 @@ } stopProgress(); - } - - public void updateOptions() - { - getCompulsoryActions().clear(); - getOptionalActions().clear(); - - if (getEntity() != null) - { - startProgress(null); - - AsyncDataProvider.getVmDiskList(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void onSuccess(Object target, Object returnValue) { - updateOptionsPostData((Collection<Disk>) returnValue); - } - }), getEntity().getId()); - } } public void addDisk() -- To view, visit http://gerrit.ovirt.org/21090 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21f7f8b7cd0733b2b2fc06cbe7cc39a9a42b755e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
