Sergey Gotliv has uploaded a new change for review. Change subject: webadmin: Confirmation window when putting storage domain on maintenance ......................................................................
webadmin: Confirmation window when putting storage domain on maintenance Change-Id: If6c673291b4a1fc2610b99710cdcdfab11ad9bd4 Bug-Url: https://bugzilla.redhat.com/1018847 Signed-off-by: Sergey Gotliv <sgot...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 3 files changed, 80 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/24267/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java index 34c6979..72306a7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java @@ -215,7 +215,7 @@ Frontend.getInstance().runQuery(VdcQueryType.GetStorageDomainsByStoragePoolId, tempVar, _asyncQuery); } - public void maintenance() + public void onMaintenance() { // Frontend.RunMultipleActions(VdcActionType.DeactivateStorageDomain, // SelectedItems.Cast<storage_domains>() @@ -228,7 +228,41 @@ pb.add(new StorageDomainPoolParametersBase(a.getId(), getEntity().getId())); } - Frontend.getInstance().runMultipleAction(VdcActionType.DeactivateStorageDomain, pb); + final ConfirmationModel confirmationModel = (ConfirmationModel) getWindow(); + confirmationModel.startProgress(null); + + Frontend.getInstance().runMultipleAction(VdcActionType.DeactivateStorageDomain, pb, new IFrontendMultipleActionAsyncCallback() { + @Override + public void executed(FrontendMultipleActionAsyncResult result) { + confirmationModel.stopProgress(); + setWindow(null); + } + }); + } + + private void maintenance() + { + ConfirmationModel model = new ConfirmationModel(); + model.setTitle(ConstantsManager.getInstance().getConstants().maintenanceStorageDomainsTitle()); + model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantToPlaceFollowingStorageDomainsIntoMaintenanceModeMsg()); + model.setHashName("maintenance_storage_domain"); //$NON-NLS-1$ + setWindow(model); + + ArrayList<String> items = new ArrayList<String>(); + for (Object selected : getSelectedItems()) { + items.add(((StorageDomain) selected).getName()); + } + model.setItems(items); + + UICommand maintenance = new UICommand("OnMaintenance", this); //$NON-NLS-1$ + maintenance.setTitle(ConstantsManager.getInstance().getConstants().ok()); + maintenance.setIsDefault(true); + model.getCommands().add(maintenance); + + UICommand cancel = new UICommand("Cancel", this); //$NON-NLS-1$ + cancel.setTitle(ConstantsManager.getInstance().getConstants().cancel()); + cancel.setIsCancel(true); + model.getCommands().add(cancel); } public void activate() @@ -779,6 +813,10 @@ { onDetach(); } + else if (StringHelper.stringsEqual(command.getName(), "OnMaintenance")) //$NON-NLS-1$ + { + onMaintenance(); + } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { cancel(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java index 464978f..bd2bc1b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java @@ -548,6 +548,31 @@ private void maintenance() { + ConfirmationModel model = new ConfirmationModel(); + model.setTitle(ConstantsManager.getInstance().getConstants().maintenanceStorageDomainsTitle()); + model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantToPlaceFollowingStorageDomainsIntoMaintenanceModeMsg()); + model.setHashName("maintenance_storage_domain"); //$NON-NLS-1$ + setWindow(model); + + ArrayList<String> items = new ArrayList<String>(); + for (Object selected : getSelectedItems()) { + items.add(((StorageDomain) selected).getName()); + } + model.setItems(items); + + UICommand maintenance = new UICommand("OnMaintenance", this); //$NON-NLS-1$ + maintenance.setTitle(ConstantsManager.getInstance().getConstants().ok()); + maintenance.setIsDefault(true); + model.getCommands().add(maintenance); + + UICommand cancel = new UICommand("Cancel", this); //$NON-NLS-1$ + cancel.setTitle(ConstantsManager.getInstance().getConstants().cancel()); + cancel.setIsCancel(true); + model.getCommands().add(cancel); + } + + private void onMaintenance() + { ArrayList<VdcActionParametersBase> list = new ArrayList<VdcActionParametersBase>(); for (Object item : getSelectedItems()) { @@ -563,11 +588,15 @@ list.add(parameters); } + final ConfirmationModel confirmationModel = (ConfirmationModel) getWindow(); + confirmationModel.startProgress(null); + Frontend.getInstance().runMultipleAction(VdcActionType.DeactivateStorageDomain, list, new IFrontendMultipleActionAsyncCallback() { @Override public void executed(FrontendMultipleActionAsyncResult result) { - + confirmationModel.stopProgress(); + setWindow(null); } }, null); } @@ -676,6 +705,10 @@ { onDetach(); } + else if (StringHelper.stringsEqual(command.getName(), "OnMaintenance")) //$NON-NLS-1$ + { + onMaintenance(); + } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { cancel(); 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 149a200..f55a112 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 @@ -2191,5 +2191,11 @@ @DefaultStringValue("Are you sure you want to deactivate the following VM disk(s)?") String areYouSureYouWantDeactivateVMDisksMsg(); + + @DefaultStringValue("Maintenance Storage Domain(s)") + String maintenanceStorageDomainsTitle(); + + @DefaultStringValue("Are you sure you want to place the following storage domain(s) into maintenance mode?") + String areYouSureYouWantToPlaceFollowingStorageDomainsIntoMaintenanceModeMsg(); } -- To view, visit http://gerrit.ovirt.org/24267 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6c673291b4a1fc2610b99710cdcdfab11ad9bd4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
