Kanagaraj M has uploaded a new change for review. Change subject: webadmin: fix displaying binary gluster hook ......................................................................
webadmin: fix displaying binary gluster hook When resolving a conflict on a hook with differet content types in different servers, the binary content is getting displayed. This now fixed by adding content type check before trying to fetch the content from backend. Change-Id: Ia189162dc339bab135979b4801c964112b24df18 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/ClusterGlusterHookListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java 2 files changed, 14 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/15704/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java index d94378e..eefb2f9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGlusterHookListModel.java @@ -258,6 +258,8 @@ engineCopy.setHookId(hookEntity.getId()); engineCopy.setServerName("Engine (Master)"); //$NON-NLS-1$ engineCopy.setStatus(hookEntity.getStatus()); + engineCopy.setContentType(hookEntity.getContentType()); + engineCopy.setChecksum(hookEntity.getChecksum()); EntityModel engineCopyModel = new EntityModel(engineCopy); serverHookModels.add(engineCopyModel); 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 929bdc1..a0a6469 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 @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.clusters; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookContentType; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook; @@ -243,8 +244,6 @@ return; } - startProgress(null); - GlusterServerHook selectedServer = (GlusterServerHook) selectedItem.getEntity(); getServerHooksList().setSelectedItem(selectedServer); @@ -252,32 +251,22 @@ getContentModel().getContent().setEntity(null); getContentModel().getStatus().setEntity(null); getContentModel().getMd5Checksum().setEntity(null); - stopProgress(); return; } - AsyncDataProvider.getGlusterHookContent(new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - String content = (String) returnValue; - getContentModel().getContent().setEntity(content); - stopProgress(); - } - }), getGlusterHookEntiry().getId(), selectedServer.getServerId()); + getContentModel().getStatus().setEntity(selectedServer.getStatus()); + getContentModel().getMd5Checksum().setEntity(selectedServer.getChecksum()); - if (selectedServer.getServerId() == null) { - getContentModel().getStatus().setEntity(getGlusterHookEntiry().getStatus()); - getContentModel().getMd5Checksum().setEntity(getGlusterHookEntiry().getChecksum()); - } - else { - for (GlusterServerHook serverHook : getGlusterHookEntiry().getServerHooks()) { - if (serverHook.getServerId() != null - && serverHook.getServerId().equals(selectedServer.getServerId())) { - getContentModel().getStatus().setEntity(serverHook.getStatus()); - getContentModel().getMd5Checksum().setEntity(serverHook.getChecksum()); - break; + if (selectedServer.getContentType() == GlusterHookContentType.TEXT) { + startProgress(null); + AsyncDataProvider.getGlusterHookContent(new AsyncQuery(this, new INewAsyncCallback() { + @Override + public void onSuccess(Object model, Object returnValue) { + String content = (String) returnValue; + getContentModel().getContent().setEntity(content); + stopProgress(); } - } + }), getGlusterHookEntiry().getId(), selectedServer.getServerId()); } } -- To view, visit http://gerrit.ovirt.org/15704 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia189162dc339bab135979b4801c964112b24df18 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
