Kanagaraj M has uploaded a new change for review. Change subject: webadmin: refactored volume-brick actions availability ......................................................................
webadmin: refactored volume-brick actions availability updating the available actions code in the volume-bricks subtab is refactored. Removed the duplicate checks. Change-Id: I4d3e025534cdafb25e3dddbb03705d8d19351b61 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java 1 file changed, 35 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/19838/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 202b671..ad4ccef 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 @@ -54,6 +54,12 @@ getReplaceBrickCommand().setIsAvailable(false); } + @Override + public GlusterVolumeEntity getEntity() + { + return (GlusterVolumeEntity) ((super.getEntity() instanceof GlusterVolumeEntity) ? super.getEntity() : null); + } + private UICommand addBricksCommand; public UICommand getAddBricksCommand() @@ -119,31 +125,38 @@ { GlusterVolumeEntity volumeEntity = (GlusterVolumeEntity) getEntity(); - if (volumeEntity.getVolumeType() == GlusterVolumeType.STRIPE - || getSelectedItems() == null || getSelectedItems().size() == 0 - || getSelectedItems().size() == volumeEntity.getBricks().size()) - { - getRemoveBricksCommand().setIsExecutionAllowed(false); + boolean allowRemove = true; + boolean allowReplace = true; + boolean allowAdvanced = true; + + if (getSelectedItems() == null || getSelectedItems().size() == 0) { + allowRemove = false; + allowReplace = false; + allowAdvanced = false; } - else if(volumeEntity.getVolumeType() == GlusterVolumeType.REPLICATE - && volumeEntity.getBricks().size() == VolumeListModel.REPLICATE_COUNT_DEFAULT) - { - getRemoveBricksCommand().setIsExecutionAllowed(false); - } - else if (volumeEntity.getVolumeType() == GlusterVolumeType.REPLICATE && getSelectedItems() == null - && getSelectedItems().size() > 1) - { - getRemoveBricksCommand().setIsExecutionAllowed(false); - } - else - { - getRemoveBricksCommand().setIsExecutionAllowed(true); + else { + if (volumeEntity.getVolumeType() == GlusterVolumeType.STRIPE + || getSelectedItems().size() == volumeEntity.getBricks().size()) { + allowRemove = false; + } + else if (volumeEntity.getVolumeType() == GlusterVolumeType.REPLICATE + && (volumeEntity.getBricks().size() == VolumeListModel.REPLICATE_COUNT_DEFAULT || getSelectedItems().size() > 1)) { + allowRemove = false; + } + + if(getSelectedItems().size() == 1) { + allowReplace = true; + allowAdvanced = getEntity().isOnline() && ((GlusterBrickEntity) getSelectedItems().get(0)).isOnline(); + } + else { + allowReplace = false; + allowAdvanced = false; + } } - getReplaceBrickCommand().setIsExecutionAllowed(getSelectedItems() != null && getSelectedItems().size() == 1); - getBrickAdvancedDetailsCommand().setIsExecutionAllowed(getSelectedItems() != null - && getSelectedItems().size() == 1 && ((GlusterVolumeEntity) getEntity()).isOnline() - && getSelectedItems().get(0) != null && ((GlusterBrickEntity) getSelectedItems().get(0)).isOnline()); + getRemoveBricksCommand().setIsExecutionAllowed(allowRemove); + getReplaceBrickCommand().setIsExecutionAllowed(allowReplace); + getBrickAdvancedDetailsCommand().setIsExecutionAllowed(allowAdvanced); } @Override -- To view, visit http://gerrit.ovirt.org/19838 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d3e025534cdafb25e3dddbb03705d8d19351b61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
