anmolbabu has uploaded a new change for review. Change subject: webadmin : Disable status button ......................................................................
webadmin : Disable status button Disable status button if rebalance and/or remove-brick is stopped. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1101181 Change-Id: Ic91f437bd40b43f24f19d23a47297ae78dbd9372 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/28165/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java index e620b22..750178c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java @@ -254,7 +254,8 @@ allowStatusRemove = volumeEntity != null && volumeEntity.getAsyncTask() != null - && volumeEntity.getAsyncTask().getType() == GlusterTaskType.REMOVE_BRICK; + && volumeEntity.getAsyncTask().getType() == GlusterTaskType.REMOVE_BRICK + && volumeEntity.getAsyncTask().getStatus() != JobExecutionStatus.ABORTED; getStopRemoveBricksCommand().setIsExecutionAllowed(allowStopRemove); getCommitRemoveBricksCommand().setIsExecutionAllowed(allowCommitRemove); 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 db929e6..dee8160 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 @@ -447,7 +447,7 @@ if (selectedVolumes.size() == 1) { GlusterVolumeEntity selectedVolume = selectedVolumes.get(0); if (selectedVolume.getStatus() == GlusterStatus.UP && selectedVolume.getVolumeType().isDistributedType() - && selectedVolume.getBricks().size() > 1) { + && selectedVolume.getAsyncTask().getStatus() != JobExecutionStatus.ABORTED && selectedVolume.getBricks().size() > 1) { return true; } } -- To view, visit http://gerrit.ovirt.org/28165 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic91f437bd40b43f24f19d23a47297ae78dbd9372 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
