Fix for support Ticket #708
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@81203 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
6f3d3d3b15
commit
f285ce1e14
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/news-feed-1.1.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/news-feed-1.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
|
@ -31,5 +31,5 @@
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/news-feed-1.1.1-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/news-feed-1.2.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#Thu Jul 11 11:44:03 CEST 2013
|
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
jarsExcludedFromWebInfLib=
|
jarsExcludedFromWebInfLib=
|
||||||
lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.1.0-SNAPSHOT
|
lastWarOutDir=/Users/massi/Documents/workspace/news-feed/target/news-feed-1.2.0-SNAPSHOT
|
||||||
warSrcDir=src/main/webapp
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
<Changeset component="org.gcube.portlets.user.NewsFeed.1-1-0" date="2013-07-08">
|
<Changeset component="org.gcube.portlets.user.NewsFeed.1-2-0"
|
||||||
<Change>Open single feed separately enhancement implemeented #1818</Change>
|
date="2013-07-08">
|
||||||
|
<Change>Fix for support Ticket #708</Change>
|
||||||
|
<Change>Fix for support Ticket #636</Change>
|
||||||
|
</Changeset>
|
||||||
|
<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>
|
<Change>links redirects correctly to user profiles</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets.user.NewsFeed.1-0-0"
|
<Changeset component="org.gcube.portlets.user.NewsFeed.1-0-0"
|
||||||
|
@ -8,7 +15,8 @@
|
||||||
<Change>Mavenized</Change>
|
<Change>Mavenized</Change>
|
||||||
<Change>Smart Refresh Support Added #1539</Change>
|
<Change>Smart Refresh Support Added #1539</Change>
|
||||||
<Change>Show HTTP URL in replies as HTML anchor links #1542</Change>
|
<Change>Show HTTP URL in replies as HTML anchor links #1542</Change>
|
||||||
<Change>Replies on App Feed exception fixed #580 prod. support</Change>
|
<Change>Replies on App Feed exception fixed #580 prod. support
|
||||||
|
</Change>
|
||||||
<Change>Add Tag people in News Feed Portlet #1535</Change>
|
<Change>Add Tag people in News Feed Portlet #1535</Change>
|
||||||
<Change>Notify people involved in post thread #1576</Change>
|
<Change>Notify people involved in post thread #1576</Change>
|
||||||
<Change>Scope Dependent News Feed #1561</Change>
|
<Change>Scope Dependent News Feed #1561</Change>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -13,7 +13,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>news-feed</artifactId>
|
<artifactId>news-feed</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>1.1.1-SNAPSHOT</version>
|
<version>1.2.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<name>gCube News Feed Portlet</name>
|
<name>gCube News Feed Portlet</name>
|
||||||
<description>
|
<description>
|
||||||
|
|
|
@ -39,6 +39,7 @@ import org.gcube.vomanagement.usermanagement.GroupManager;
|
||||||
import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
|
import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
|
||||||
|
|
||||||
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
||||||
|
import com.liferay.portal.NoSuchUserException;
|
||||||
import com.liferay.portal.kernel.exception.PortalException;
|
import com.liferay.portal.kernel.exception.PortalException;
|
||||||
import com.liferay.portal.kernel.exception.SystemException;
|
import com.liferay.portal.kernel.exception.SystemException;
|
||||||
import com.liferay.portal.kernel.util.WebKeys;
|
import com.liferay.portal.kernel.util.WebKeys;
|
||||||
|
@ -95,8 +96,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
_log.warn("USER IS NULL setting testing user and Running OUTSIDE PORTAL");
|
_log.warn("USER IS NULL setting testing user and Running OUTSIDE PORTAL");
|
||||||
user = "test.user";
|
user = "test.user";
|
||||||
// user = "massimiliano.assante";
|
// user = "massimiliano.assante";
|
||||||
// SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/devVRE");
|
// SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/devVRE");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
withinPortal = true;
|
withinPortal = true;
|
||||||
|
@ -473,11 +474,18 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
String username = getASLSession().getUsername();
|
String username = getASLSession().getUsername();
|
||||||
|
|
||||||
ArrayList<String> likedFeeds = (ArrayList<String>) store.getAllLikedFeedIdsByUser(getASLSession().getUsername());
|
ArrayList<String> likedFeeds = (ArrayList<String>) store.getAllLikedFeedIdsByUser(getASLSession().getUsername());
|
||||||
|
boolean skip = false;
|
||||||
for (Feed feed : toEnhance) {
|
for (Feed feed : toEnhance) {
|
||||||
|
skip = false;
|
||||||
feed.setDescription(replaceAmpersand(feed.getDescription()));
|
feed.setDescription(replaceAmpersand(feed.getDescription()));
|
||||||
if (! feed.isApplicationFeed())
|
if (! feed.isApplicationFeed()) {
|
||||||
feed.setThumbnailURL(getUserImagePortraitUrlLocal(feed.getEntityId()));
|
String thumb = getUserImagePortraitUrlLocal(feed.getEntityId());
|
||||||
|
if (thumb == null) {
|
||||||
|
_log.warn(feed.getEntityId() + " is not avaialble on this portal, skipping this feed: " + feed.getKey());
|
||||||
|
skip = true;
|
||||||
|
} else
|
||||||
|
feed.setThumbnailURL(thumb);
|
||||||
|
}
|
||||||
//if likedFeeds contains this feed key it means the user already Liked it
|
//if likedFeeds contains this feed key it means the user already Liked it
|
||||||
boolean liked = likedFeeds.contains(feed.getKey());
|
boolean liked = likedFeeds.contains(feed.getKey());
|
||||||
int commentsNo = 0;
|
int commentsNo = 0;
|
||||||
|
@ -488,6 +496,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
commentsNo = 0;
|
commentsNo = 0;
|
||||||
_log.error("NumberFormatException while reading comments number " + e.getMessage());
|
_log.error("NumberFormatException while reading comments number " + e.getMessage());
|
||||||
}
|
}
|
||||||
|
if (!skip) {
|
||||||
if (commentsNo == 0) {
|
if (commentsNo == 0) {
|
||||||
EnhancedFeed toAdd = null;
|
EnhancedFeed toAdd = null;
|
||||||
//create the enhanced feed
|
//create the enhanced feed
|
||||||
|
@ -516,6 +525,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
toReturn.add(toAdd);
|
toReturn.add(toAdd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
_log.trace("ENHANCED FEEDS TOTAL= " + toReturn.size() + " for user: " + username);
|
_log.trace("ENHANCED FEEDS TOTAL= " + toReturn.size() + " for user: " + username);
|
||||||
|
@ -536,7 +546,11 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
User user = null;
|
User user = null;
|
||||||
try {
|
try {
|
||||||
user = UserLocalServiceUtil.getUserByScreenName(OrganizationsUtil.getCompany().getCompanyId(), screenName);
|
user = UserLocalServiceUtil.getUserByScreenName(OrganizationsUtil.getCompany().getCompanyId(), screenName);
|
||||||
} catch (PortalException e) {
|
}
|
||||||
|
catch (com.liferay.portal.NoSuchUserException ex) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch (PortalException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} catch (SystemException e) {
|
} catch (SystemException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
@ -552,7 +566,9 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
ArrayList<Like> toReturn = (ArrayList<Like>) store.getAllLikesByFeed(feedid);
|
ArrayList<Like> toReturn = (ArrayList<Like>) store.getAllLikesByFeed(feedid);
|
||||||
_log.trace("Asking likes for " + feedid);
|
_log.trace("Asking likes for " + feedid);
|
||||||
for (Like like : toReturn) {
|
for (Like like : toReturn) {
|
||||||
like.setThumbnailURL(getUserImagePortraitUrlLocal(like.getUserid()));
|
String thumb = getUserImagePortraitUrlLocal(like.getUserid());
|
||||||
|
|
||||||
|
like.setThumbnailURL(thumb == null ? "" : thumb);
|
||||||
}
|
}
|
||||||
return toReturn;
|
return toReturn;
|
||||||
}
|
}
|
||||||
|
@ -562,7 +578,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
_log.trace("Asking comments for " + feedid);
|
_log.trace("Asking comments for " + feedid);
|
||||||
ArrayList<Comment> toReturn = (ArrayList<Comment>) store.getAllCommentByFeed(feedid);
|
ArrayList<Comment> toReturn = (ArrayList<Comment>) store.getAllCommentByFeed(feedid);
|
||||||
for (Comment comment : toReturn) {
|
for (Comment comment : toReturn) {
|
||||||
comment.setThumbnailURL(getUserImagePortraitUrlLocal(comment.getUserid()));
|
String thumb = getUserImagePortraitUrlLocal(comment.getUserid());
|
||||||
|
comment.setThumbnailURL(thumb == null ? "" : thumb);
|
||||||
}
|
}
|
||||||
Collections.sort(toReturn);
|
Collections.sort(toReturn);
|
||||||
return toReturn;
|
return toReturn;
|
||||||
|
|
Loading…
Reference in New Issue