From f47f830afafc0f05827bcb9dfc52be18c8386d49 Mon Sep 17 00:00:00 2001 From: NgocTM Date: Thu, 15 Oct 2015 11:49:25 +0700 Subject: [PATCH] SOC-5101 Profile page of a deleted/disabled user Fix description: Hide Connect button in deleted/disabled user profile. --- .../user/portlet/UIRelationshipAction.java | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/portlet/UIRelationshipAction.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/portlet/UIRelationshipAction.java index e165411523..6d94d3e25f 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/portlet/UIRelationshipAction.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/portlet/UIRelationshipAction.java @@ -57,44 +57,47 @@ public UIRelationshipAction setRenderedActions(boolean isRenderedActions) { public void processRender(WebuiRequestContext context) throws Exception { Identity viewerIdentity = Utils.getViewerIdentity();// current login user Identity ownerIdentity = Utils.getOwnerIdentity(); // current user viewing - // - Writer writer = context.getWriter(); - writer.append("
"); - writer.append("
"); - // - if (isRenderedActions && !ownerIdentity.equals(viewerIdentity)) { - Relationship relationship = Utils.getRelationshipManager().get(viewerIdentity, ownerIdentity); - Type status = (relationship != null) ? relationship.getStatus() : null; - - if(status == null) { - writer.append(""); - } else if(status == Type.PENDING) {//PENDING - if(relationship.getSender().equals(viewerIdentity)) { - writer.append(""); - } else { - writer.append(" "); - writer.append(""); + + if(!(ownerIdentity.isDeleted() || ownerIdentity.isEnable())){ + // + Writer writer = context.getWriter(); + writer.append("
"); + writer.append("
"); + // + if (isRenderedActions && !ownerIdentity.equals(viewerIdentity)) { + Relationship relationship = Utils.getRelationshipManager().get(viewerIdentity, ownerIdentity); + Type status = (relationship != null) ? relationship.getStatus() : null; + + if(status == null) { + writer.append(""); + } else if(status == Type.PENDING) {//PENDING + if(relationship.getSender().equals(viewerIdentity)) { + writer.append(""); + } else { + writer.append(" "); + writer.append(""); + } + } else if(status == Type.CONFIRMED) { + writer.append(""); + writer.append(""); } - } else if(status == Type.CONFIRMED) { - writer.append(""); - writer.append(""); + writer.append("
"); + writer.append("
"); + } else { + super.processRender(context); } - writer.append("
"); - writer.append("
"); - } else { - super.processRender(context); - } + } } public static abstract class AbstractActionListener extends EventListener {