added images
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@72924 82a268e6-3cf1-43bd-a215-b396298e98cf
1
pom.xml
|
@ -75,6 +75,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>wsmail-widget</artifactId>
|
<artifactId>wsmail-widget</artifactId>
|
||||||
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
|
|
|
@ -438,7 +438,8 @@ public class NewsFeedPanel extends Composite {
|
||||||
newsPanel.clear();
|
newsPanel.clear();
|
||||||
newsPanel.add(new HTML("<div class=\"nofeed-message\">" +
|
newsPanel.add(new HTML("<div class=\"nofeed-message\">" +
|
||||||
"Ops! There were problems while retrieving your feeds!. <br> " +
|
"Ops! There were problems while retrieving your feeds!. <br> " +
|
||||||
"Looks like we are not able to communicate with the infrastructure, <br> please try again in a short while.</div>"));
|
"Looks like we are not able to communicate with the infrastructure, (or your session expired)<br> please try again in a short while or refresh the page.</div>"));
|
||||||
|
stopTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doAddLike(final TweetTemplate owner, final String feedId) {
|
private void doAddLike(final TweetTemplate owner, final String feedId) {
|
||||||
|
|
|
@ -104,6 +104,11 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
||||||
return getEclipseResult(userName, false);
|
return getEclipseResult(userName, false);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
//in case the portal is restarted and you have the social home open it will get test.user (no callback to set session info)
|
||||||
|
//this check just return nothing if that happens
|
||||||
|
if (userName.compareTo("test.user") == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
_log.info("****** retrieving feeds for user: " + userName);
|
_log.info("****** retrieving feeds for user: " + userName);
|
||||||
User currUser = OrganizationsUtil.validateUser(userName);
|
User currUser = OrganizationsUtil.validateUser(userName);
|
||||||
|
|
||||||
|
|
After Width: | Height: | Size: 997 B |
After Width: | Height: | Size: 316 B |
After Width: | Height: | Size: 73 B |
After Width: | Height: | Size: 3.4 KiB |
After Width: | Height: | Size: 301 B |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 167 B |
After Width: | Height: | Size: 5.1 KiB |
After Width: | Height: | Size: 223 B |
After Width: | Height: | Size: 3.2 KiB |
After Width: | Height: | Size: 827 B |
After Width: | Height: | Size: 4.8 KiB |