anmolbabu has uploaded a new change for review. Change subject: webadmin : Fix for stop rebalance from status pop up not enabled in some cases ......................................................................
webadmin : Fix for stop rebalance from status pop up not enabled in some cases Fix for stop rebalance from status pop up not enabled in some cases during refresh. Change-Id: I237be3005e064c3ed414f04f544909b115321594 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Anmol Babu <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java 2 files changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/20422/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java index 4eac635..013c297 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.common.job.JobExecutionStatus; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -36,6 +37,8 @@ private boolean isStatusAvailable; private Timer refresh; + + private UICommand stopReblanceFromStatus; public VolumeRebalanceStatusModel(final GlusterVolumeEntity volumeEntity) { setStatus(new EntityModel()); @@ -116,6 +119,7 @@ refresh.cancel(); } } + getStopReblanceFromStatus().setIsExecutionAllowed(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.STARTED); } public void cancelRefresh() { @@ -160,4 +164,12 @@ onPropertyChanged(new PropertyChangedEventArgs("IS_STATUS_APPLICABLE"));//$NON-NLS-1$ } } + + public UICommand getStopReblanceFromStatus() { + return stopReblanceFromStatus; + } + + public void setStopReblanceFromStatus(UICommand stopReblanceFromStatus) { + this.stopReblanceFromStatus = stopReblanceFromStatus; + } } 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 7850fec..170373b 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 @@ -599,20 +599,17 @@ rebalanceStatusModel.getVolume().setEntity(volumeEntity.getName()); rebalanceStatusModel.getCluster().setEntity(volumeEntity.getVdsGroupName()); - rebalanceStatusModel.showStatus(rebalanceStatusEntity); - - UICommand stopRebalanceFromStatus = - new UICommand("stop_rebalance_from_status", VolumeListModel.this);//$NON-NLS-1$ - + UICommand stopRebalanceFromStatus = new UICommand("stop_rebalance_from_status", VolumeListModel.this);//$NON-NLS-1$ stopRebalanceFromStatus.setTitle(ConstantsManager.getInstance().getConstants().stopRebalance()); rebalanceStatusModel.getCommands().add(stopRebalanceFromStatus); - - stopRebalanceFromStatus.setIsExecutionAllowed(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.STARTED); + rebalanceStatusModel.setStopReblanceFromStatus(stopRebalanceFromStatus); UICommand cancelRebalance = new UICommand("CancelRebalanceStatus", VolumeListModel.this);//$NON-NLS-1$ cancelRebalance.setTitle(ConstantsManager.getInstance().getConstants().close()); cancelRebalance.setIsCancel(true); rebalanceStatusModel.getCommands().add(cancelRebalance); + + rebalanceStatusModel.showStatus(rebalanceStatusEntity); }else { VolumeRebalanceStatusModel statusModel = (VolumeRebalanceStatusModel) getWindow(); statusModel.getCommands().get(0).setIsExecutionAllowed(false); -- To view, visit http://gerrit.ovirt.org/20422 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I237be3005e064c3ed414f04f544909b115321594 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
