Kanagaraj M has uploaded a new change for review. Change subject: webadmin: re-order gluster hook conflict actions ......................................................................
webadmin: re-order gluster hook conflict actions When a hook has both content and missing conflicts if the user selects 'Remove' to resolve a missing conflict then the content conflict actions should be disabled. Also moved the missing conflict to the top. Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9 Bug-Url: https://bugzilla.redhat.com/975795 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml 2 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/16630/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java index f7227bb..5b1d7bb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java @@ -226,6 +226,8 @@ if ((Boolean) getResolveMissingConflictRemove().getEntity()) { getResolveMissingConflictCopy().setEntity(Boolean.FALSE); } + + updateConflictActionsAvailability((Boolean) getResolveMissingConflictRemove().getEntity()); } }); @@ -238,6 +240,13 @@ getResolveMissingConflictRemove().setEntity(Boolean.FALSE); } + private void updateConflictActionsAvailability(boolean isRemove) { + getResolveContentConflict().setEntity(!isRemove); + getResolveContentConflict().setIsChangable(!isRemove); + getResolveStatusConflict().setEntity(!isRemove); + getResolveStatusConflict().setIsChangable(!isRemove); + } + private void onSelectedHookSourceChanged() { EntityModel selectedItem = (EntityModel) getHookSources().getSelectedItem(); if (selectedItem == null) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml index 0fad98b..3398b64 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml @@ -75,9 +75,9 @@ <g:HorizontalPanel> <g:Label ui:field="conflictReasonsLabel" addStyleNames="{style.sectionHeaderLabel}"/> <g:VerticalPanel> + <g:Label ui:field="conflictReasonsMissingHookLabel" addStyleNames="{style.conflictReasonLabel}"/> <g:Label ui:field="conflictReasonsContentDiffLabel" addStyleNames="{style.conflictReasonLabel}"/> <g:Label ui:field="conflictReasonsStatusDiffLabel" addStyleNames="{style.conflictReasonLabel}"/> - <g:Label ui:field="conflictReasonsMissingHookLabel" addStyleNames="{style.conflictReasonLabel}"/> </g:VerticalPanel> </g:HorizontalPanel> @@ -98,6 +98,14 @@ <g:VerticalPanel ui:field="resolvePanel"> <g:Label ui:field="resolveHeaderLabel" addStyleNames="{style.sectionHeaderLabel}"/> + <g:VerticalPanel ui:field="resolveMissingConflictPanel"> + <e:EntityModelCheckBoxEditor ui:field="resolveMissingConflict"/> + <g:HorizontalPanel addStyleNames="{style.resolveConflictInternalPanel}"> + <e:EntityModelRadioButtonEditor ui:field="resolveMissingConflictCopyEditor"/> + <e:EntityModelRadioButtonEditor ui:field="resolveMissingConflictRemoveEditor"/> + </g:HorizontalPanel> + </g:VerticalPanel> + <g:VerticalPanel ui:field="resolveContentConflictPanel"> <g:HorizontalPanel> <e:EntityModelCheckBoxEditor ui:field="resolveContentConflict"/> @@ -117,13 +125,6 @@ </g:HorizontalPanel> </g:VerticalPanel> - <g:VerticalPanel ui:field="resolveMissingConflictPanel"> - <e:EntityModelCheckBoxEditor ui:field="resolveMissingConflict"/> - <g:HorizontalPanel addStyleNames="{style.resolveConflictInternalPanel}"> - <e:EntityModelRadioButtonEditor ui:field="resolveMissingConflictCopyEditor"/> - <e:EntityModelRadioButtonEditor ui:field="resolveMissingConflictRemoveEditor"/> - </g:HorizontalPanel> - </g:VerticalPanel> </g:VerticalPanel> <g:Label ui:field="messageLabel" addStyleNames="{style.messageLabel}" /> -- To view, visit http://gerrit.ovirt.org/16630 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9 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
