gCubeSystem
/
notifications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added handling of notification type forward complete 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@68533 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-01-29 17:51:54 +00:00
parent c461d4e798
commit e3bc385ab8
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.classpath
View File

@ -20,16 +20,16 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/notifications-0.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

11
src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
View File

@ -70,10 +70,13 @@ public class SingleNotificationView extends Composite {
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Document Workflow.</a>");
break;
case DOCUMENT_WORKFLOW_VIEW:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See User Activity.</a>");
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
break;
case DOCUMENT_WORKFLOW_EDIT:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See User Activity.</a>");
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
break;
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
break;
}
}
@ -112,10 +115,12 @@ public class SingleNotificationView extends Composite {
return images.documentWorkflow();
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
return images.documentWorkflow();
case DOCUMENT_WORKFLOW_STEP_FORWARD_OWNER:
case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER:
return images.workflowForward();
case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
return images.workflowForward();
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
return images.workflowForwardComplete();
default:
return images.generic();
}

3
src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java
View File

@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle {
@Source("workflow-forward.png")
ImageResource workflowForward();
@Source("workflow-forward-complete.jpg")
ImageResource workflowForwardComplete();
@Source("notification-generic.png")
ImageResource generic();
}

BIN
src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
View File

@ -59,7 +59,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
if (user == null) {
//user = "test.user";
user = "pasquale.pagano";
user = "luca.frosini";
_log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL");
withinPortal = false;