diff --git a/.classpath b/.classpath index 030fc28..53a5205 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 4f548e1..35a2c6d 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,6 +1,6 @@ -#Fri Jan 04 14:59:05 CET 2013 +#Thu Apr 18 12:31:11 CEST 2013 eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-0.1.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-0.2.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index 1e90b40..b15e172 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user notifications war - 0.1.0-SNAPSHOT + 0.2.0-SNAPSHOT gCube Notifications Portlet diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java index 0c90b4d..8b7b061 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java @@ -70,6 +70,12 @@ public class SingleNotificationView extends Composite { notificationImage.setResource(getImageType(toShow.getType())); switch (toShow.getType()) { + case MENTION: + case LIKE: + case COMMENT: + case OWN_COMMENT: + goApp.setHTML(" See this Post."); + break; case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK: goApp.setHTML(" See this Document Workflow."); //remove the Sender of the notification because it is sent by the user that performs the last forward diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java index ccea716..7e18bc0 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java @@ -61,8 +61,8 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); if (user == null) { user = "test.user"; - //user = "leonardo.candela"; -// user = "massimiliano.assante"; + user = "massimiliano.assante"; + _log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL"); withinPortal = false; }