From 509ee88dfc4ddde323f7a5b0723b8abec1730c23 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 9 Feb 2018 11:07:09 +0000 Subject: [PATCH] minor fix for #11139 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@163117 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +++--- .settings/org.eclipse.wst.common.component | 3 --- distro/changelog.xml | 16 ++++++++++++---- pom.xml | 2 +- .../user/newsfeed/client/ui/TweetTemplate.java | 13 +++++++------ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.classpath b/.classpath index 45a4bb8..2f0f295 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -39,5 +39,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 18ea1db..3fad16f 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ - - uses - diff --git a/distro/changelog.xml b/distro/changelog.xml index be37ed3..b2aa0ea 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,20 +1,28 @@ + + Support for ticket #11139 + - fixes for Incident #10262: Cannot see who liked posts on VREs of Parthenos - Feature #10242: add comment taking up to 3 seconds sometime to be delivered in the UI now shows a loader + fixes for Incident #10262: Cannot see who liked posts on VREs + of Parthenos + Feature #10242: add comment taking up to 3 seconds sometime to + be delivered in the UI now shows a loader Ported to GWT 2.8.1 fixes for changes to the underneath - common-notification-library + common-notification-library + Minor css fix Refactored to the new version of elastic search client's compliancy Feature #7212, do not apologies if no posts are present and - try to engage the user to post something. + try to engage the user to post something. + diff --git a/pom.xml b/pom.xml index d28ea17..faae2bc 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user news-feed war - 2.5.0-SNAPSHOT + 2.5.1-SNAPSHOT gCube News Feed Portlet diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java index 409fb0c..934dd6a 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java @@ -312,6 +312,13 @@ public class TweetTemplate extends Composite { feedText = feedText.replaceAll("&","&"); final String profilePageURL = GCubePortalConstants.PREFIX_GROUP_URL + NewsFeedPanel.extractOrgFriendlyURL(Location.getHref()) +GCubePortalConstants.USER_PROFILE_FRIENDLY_URL; + + //show the vreid iff the info is present + this.vreSource.setVisible(true); + if (showTimelineSource && feed.getVreid() != null && feed.getVreid().compareTo("") != 0) { + String vreName = feed.getVreid().substring(feed.getVreid().lastIndexOf("/")+1); + vreSource.setHTML("[" +vreName + "]"); + } if (! isAppFeed) { // sharePostArea.setHTML("" + NewsFeedPanel.SHARE_FWD_LABEL + ""); @@ -320,12 +327,6 @@ public class TweetTemplate extends Composite { Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+ Encoder.encode(feed.getEntityId())+"\">"+feed.getFullName()+" " + feedText); - this.vreSource.setVisible(true); - //show the vreid iff the info is present - if (showTimelineSource && feed.getVreid() != null && feed.getVreid().compareTo("") != 0) { - String vreName = feed.getVreid().substring(feed.getVreid().lastIndexOf("/")+1); - vreSource.setHTML("[" +vreName + "]"); - } //check if the user has his own avatar if (feed.getThumbnailURL().contains("img_id=0") || !feed.getThumbnailURL().contains("?")) { //it means no avatar is set avatarImage.setVisible(false);