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:
parent
c461d4e798
commit
e3bc385ab8
10
.classpath
10
.classpath
|
@ -20,16 +20,16 @@
|
||||||
<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="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">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<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="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"/>
|
<classpathentry kind="output" path="target/notifications-0.1.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -70,10 +70,13 @@ public class SingleNotificationView extends Composite {
|
||||||
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Document Workflow.</a>");
|
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Document Workflow.</a>");
|
||||||
break;
|
break;
|
||||||
case DOCUMENT_WORKFLOW_VIEW:
|
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;
|
break;
|
||||||
case DOCUMENT_WORKFLOW_EDIT:
|
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;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -112,10 +115,12 @@ public class SingleNotificationView extends Composite {
|
||||||
return images.documentWorkflow();
|
return images.documentWorkflow();
|
||||||
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
|
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
|
||||||
return images.documentWorkflow();
|
return images.documentWorkflow();
|
||||||
case DOCUMENT_WORKFLOW_STEP_FORWARD_OWNER:
|
case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER:
|
||||||
return images.workflowForward();
|
return images.workflowForward();
|
||||||
case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
|
case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
|
||||||
return images.workflowForward();
|
return images.workflowForward();
|
||||||
|
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
|
||||||
|
return images.workflowForwardComplete();
|
||||||
default:
|
default:
|
||||||
return images.generic();
|
return images.generic();
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle {
|
||||||
@Source("workflow-forward.png")
|
@Source("workflow-forward.png")
|
||||||
ImageResource workflowForward();
|
ImageResource workflowForward();
|
||||||
|
|
||||||
|
@Source("workflow-forward-complete.jpg")
|
||||||
|
ImageResource workflowForwardComplete();
|
||||||
|
|
||||||
@Source("notification-generic.png")
|
@Source("notification-generic.png")
|
||||||
ImageResource generic();
|
ImageResource generic();
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
|
@ -59,7 +59,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
|
||||||
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
|
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
//user = "test.user";
|
//user = "test.user";
|
||||||
user = "pasquale.pagano";
|
user = "luca.frosini";
|
||||||
|
|
||||||
_log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL");
|
_log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL");
|
||||||
withinPortal = false;
|
withinPortal = false;
|
||||||
|
|
Loading…
Reference in New Issue