Kanagaraj M has uploaded a new change for review. Change subject: webadmin: display empty content for binary gluster hook ......................................................................
webadmin: display empty content for binary gluster hook While resolving a conflicting hook, if one of the host is having a binary hook and others are having text hook, content from the previously selected host is shown. This is fixed now by showing an empty content when host with binary content is selected. Change-Id: I6b430701474ff22c55109df3268f85fd833fe5a4 Bug-Url: https://bugzilla.redhat.com/973091 Signed-off-by: Kanagaraj M <kmayi...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/21710/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 5b1d7bb..8270961 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 @@ -277,6 +277,9 @@ } }), getGlusterHookEntity().getId(), selectedServer.getServerId()); } + else { + getContentModel().getContent().setEntity(null); + } } public boolean isAnyResolveActionSelected() { -- To view, visit http://gerrit.ovirt.org/21710 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b430701474ff22c55109df3268f85fd833fe5a4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
