gCubeSystem
/
news-feed
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Costantino Perciante 2018-02-09 11:07:09 +00:00
parent 5e32ff1a54
commit 509ee88dfc
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/news-feed-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/news-feed-2.5.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/news-feed-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/news-feed-2.5.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -39,5 +39,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/news-feed-2.5.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/news-feed-2.5.1-SNAPSHOT/WEB-INF/classes"/>
</classpath>

3
.settings/org.eclipse.wst.common.component
View File

@ -5,9 +5,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="gcube-widgets-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="news-feed"/>
</wb-module>

16
distro/changelog.xml
View File

@ -1,20 +1,28 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.news-feed.2-5-1"
date="2018-02-14">
<Change>Support for ticket #11139</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.news-feed.2-5-0"
date="2017-11-13">
<Change>fixes for Incident #10262: Cannot see who liked posts on VREs of Parthenos</Change>
<Change>Feature #10242: add comment taking up to 3 seconds sometime to be delivered in the UI now shows a loader</Change>
<Change>fixes for Incident #10262: Cannot see who liked posts on VREs
of Parthenos</Change>
<Change>Feature #10242: add comment taking up to 3 seconds sometime to
be delivered in the UI now shows a loader</Change>
<Change>Ported to GWT 2.8.1</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.news-feed.2-3-0"
date="2017-02-20">
<Change>fixes for changes to the underneath
common-notification-library</Change>
common-notification-library
</Change>
<Change>Minor css fix </Change>
<Change>Refactored to the new version of elastic search client's
compliancy
</Change>
<Change>Feature #7212, do not apologies if no posts are present and
try to engage the user to post something.</Change>
try to engage the user to post something.
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.news-feed.2-2-0"
date="2016-12-02">

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>news-feed</artifactId>
<packaging>war</packaging>
<version>2.5.0-SNAPSHOT</version>
<version>2.5.1-SNAPSHOT</version>
<name>gCube News Feed Portlet</name>
<description>

13
src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
View File

@ -312,6 +312,13 @@ public class TweetTemplate extends Composite {
feedText = feedText.replaceAll("&amp;","&");
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("<a class=\"link\" style=\"font-size: 10px; white-space: nowrap;\" href=\"/group/"+vreName.toLowerCase()+"\">[" +vreName + "]</a>");
}
if (! isAppFeed) {
// sharePostArea.setHTML("<a>" + NewsFeedPanel.SHARE_FWD_LABEL + "</a>");
@ -320,12 +327,6 @@ public class TweetTemplate extends Composite {
Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
Encoder.encode(feed.getEntityId())+"\">"+feed.getFullName()+"</a> " + 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("<a class=\"link\" style=\"font-size: 10px; white-space: nowrap;\" href=\"/group/"+vreName.toLowerCase()+"\">[" +vreName + "]</a>");
}
//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);