From df31e460c1f18993973289996df5834c241d9c1a Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 18 Jul 2013 17:01:36 +0000
Subject: [PATCH] links redirects correctly to user profiles

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@79414 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                 |  1 +
 .../newsfeed/client/templates/SingleComment.java     | 11 +++++++++--
 .../newsfeed/client/templates/TweetTemplate.java     | 12 ++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 4ebe93a..dae22b5 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,6 +1,7 @@
 <ReleaseNotes>
 <Changeset component="org.gcube.portlets.user.NewsFeed.1-1-0" date="2013-07-08">
 		<Change>Open single feed separately enhancement implemeented #1818</Change>
+		<Change>links redirects correctly to user profiles</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.NewsFeed.1-0-0"
 		date="2013-04-19">
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java
index f976884..1689769 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java
@@ -1,6 +1,7 @@
 package org.gcube.portlets.user.newsfeed.client.templates;
 
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
+import org.gcube.portal.databook.client.util.Encoder;
 import org.gcube.portal.databook.shared.Comment;
 import org.gcube.portlets.user.newsfeed.client.event.DeleteCommentEvent;
 import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
@@ -56,7 +57,10 @@ public class SingleComment extends Composite {
 			seeMore.setHTML("<a class=\"seemore\"> See More </a>");
 		}
 		
-		commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+toShow.getFullName()+"</a> " + commentToShow);
+		commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
+					Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
+					Encoder.encode(toShow.getUserid())+"\">"+toShow.getFullName()+
+					"</a> " + commentToShow);
 		timeArea.setHTML(DateTimeFormat.getFormat("MMMM dd, h:mm a").format(toShow.getTime()));
 		if (isUsers) {
 			closeImage.setStyleName("closeImage");
@@ -68,7 +72,10 @@ public class SingleComment extends Composite {
 	
 	@UiHandler("seeMore") 
 	void onSeeMoreClick(ClickEvent e) {
-		commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+myComment.getFullName()+"</a> " + myComment.getText());
+		commentText.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
+					Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
+					Encoder.encode(myComment.getUserid())+"\">"+
+					myComment.getFullName()+"</a> " + myComment.getText());
 		seeMore.setHTML("");
 	}	
 	
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java
index 7e6041c..3a23b59 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
+import org.gcube.portal.databook.client.util.Encoder;
 import org.gcube.portal.databook.shared.Comment;
 import org.gcube.portal.databook.shared.Feed;
 import org.gcube.portal.databook.shared.UserInfo;
@@ -150,7 +151,10 @@ public class TweetTemplate extends Composite {
 
 		if (! isAppFeed) {
 			messageArea.setHTML("<a>" + NewsFeedPanel.MESSAGE_LABEL + "</a>");
-			contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+feed.getFullName()+"</a> " + feedText);
+			contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK
+					+"?"+
+					Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
+					Encoder.encode(feed.getEntityId())+"\">"+feed.getFullName()+"</a> " + feedText);
 		}
 		else {
 			//			messageSeparator.setVisible(false);
@@ -245,7 +249,11 @@ public class TweetTemplate extends Composite {
 
 	@UiHandler("seeMore") 
 	void onSeeMoreClick(ClickEvent e) {
-		contentArea.setHTML("<a class=\"link\" href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"\">"+myFeed.getFeed().getFullName()+"</a> " + myFeed.getFeed().getDescription());
+		contentArea.setHTML("<a class=\"link\"href=\""+GCubeSocialNetworking.USER_PROFILE_LINK+"?"+
+					Encoder.encode(GCubeSocialNetworking.USER_PROFILE_OID)+"="+
+					Encoder.encode(myFeed.getFeed().getEntityId())+"\">"+
+					myFeed.getFeed().getFullName()+"</a> " + myFeed.getFeed().getDescription());
+		
 		seeMore.setHTML("");
 	}