Ramesh N has uploaded a new change for review.

Change subject: webadmin: Fix for stop/status rebalance issue
......................................................................

webadmin: Fix for stop/status rebalance issue

  This patch fixes following bugs.
1. Showing volume names on the stop rebalance confimation dialog
2. Cancel button not working stop rebalance confirmation

Change-Id: Ia0c6a8fdc6a74134cf2fccec11e941d151355a92
Bug-Url:https://bugzilla.redhat.com/show_bug.cgi?id=1021334
Signed-off-by: Ramesh Nachimuthu <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/20632/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
index 58e09ae..495a5f7 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
@@ -477,6 +477,8 @@
             onStopRebalance();
         } else if (command.equals(getStatusRebalanceCommand())) {
             showRebalanceStatus();
+        } else if (command.getName().equals("CancelConfirmation")) { 
//$NON-NLS-1$
+            setConfirmWindow(null);
         } else if (command.getName().equals("CancelRebalanceStatus")) 
{//$NON-NLS-1$
             cancelRebalanceStatus();
         }else if (command.equals(getOptimizeForVirtStoreCommand())) {
@@ -522,11 +524,18 @@
         
model.setTitle(ConstantsManager.getInstance().getConstants().confirmStopVolumeRebalanceTitle());
         model.setHashName("volume_rebalance_stop"); //$NON-NLS-1$
         
model.setMessage(ConstantsManager.getInstance().getConstants().confirmStopVolumeRebalanceMsg());
+
+        ArrayList<String> list = new ArrayList<String>();
+        for (GlusterVolumeEntity item : Linq.<GlusterVolumeEntity> 
cast(getSelectedItems()))
+        {
+            list.add(item.getName());
+        }
+        model.setItems(list);
         UICommand okCommand = new UICommand("onStopRebalance", this); 
//$NON-NLS-1$
         okCommand.setTitle(ConstantsManager.getInstance().getConstants().ok());
         okCommand.setIsDefault(true);
         model.getCommands().add(okCommand);
-        UICommand cancelCommand = new UICommand("Cancel", this); //$NON-NLS-1$
+        UICommand cancelCommand = new UICommand("CancelConfirmation", this); 
//$NON-NLS-1$
         
cancelCommand.setTitle(ConstantsManager.getInstance().getConstants().cancel());
         cancelCommand.setIsCancel(true);
         model.getCommands().add(cancelCommand);


-- 
To view, visit http://gerrit.ovirt.org/20632
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0c6a8fdc6a74134cf2fccec11e941d151355a92
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ramesh N <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to