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

removed support for document workflow notifications

Browse Source 
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@131779 82a268e6-3cf1-43bd-a215-b396298e98cf
Feature/23194
Massimiliano Assante 8 years ago
parent 94bad2fb07
commit 3e7b8ada35
8 changed files with 17 additions and 60 deletions
Show Stats Download Patch File Download Diff File

16
.classpath
Unescape Escape View File

@ -1,19 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/notifications-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/notifications-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
<classpathentry excluding="**" kind="src" output="target/notifications-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@ -30,5 +38,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/notifications-2.0.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/notifications-2.1.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

1
.project
Unescape Escape View File

@ -55,5 +55,6 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.google.gwt.eclipse.core.gwtNature</nature>
<nature>com.liferay.ide.core.liferayNature</nature>
</natures>
</projectDescription>

1
.settings/org.eclipse.wst.common.component
Unescape Escape View File

@ -4,6 +4,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<dependent-module archiveName="gcube-widgets-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
<dependency-type>uses</dependency-type>
</dependent-module>

2
pom.xml
Unescape Escape View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>notifications</artifactId>
<packaging>war</packaging>
<version>2.0.0-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<name>gCube Notifications Portlet</name>
<properties>

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

@ -88,23 +88,6 @@ public class SingleNotificationView extends Composite {
case POST_ALERT:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Post.</a>");
break;
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this Document Workflow.</a>");
//remove the Sender of the notification because it is sent by the user that performs the last forward
notificationText.setHTML(actualHTML);
break;
case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See this New Document Workflow.</a>");
break;
case DOCUMENT_WORKFLOW_VIEW:
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 Users Activity.</a>");
break;
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
break;
case WP_FOLDER_SHARE:
case WP_FOLDER_UNSHARE:
case WP_FOLDER_ADDEDUSER:
@ -160,20 +143,6 @@ public class SingleNotificationView extends Composite {
return images.jobNOK();
case JOB_COMPLETED_OK:
return images.jobOK();
case DOCUMENT_WORKFLOW_EDIT:
return images.documentWorkflow();
case DOCUMENT_WORKFLOW_VIEW:
return images.documentWorkflow();
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
return images.documentWorkflow();
case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT:
return images.documentWorkflowNew();
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();
case CALENDAR_ADDED_EVENT:
return images.calendar();
case CALENDAR_UPDATED_EVENT:

7
src/main/webapp/conf/categorybytype.properties
Unescape Escape View File

@ -1,10 +1,3 @@
DOCUMENT_WORKFLOW_EDIT=Application: Document Workflow
DOCUMENT_WORKFLOW_VIEW=Application: Document Workflow
DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Application: Document Workflow
DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Application: Document Workflow
DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Application: Document Workflow
DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Application: Document Workflow
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Application: Document Workflow
TDM_TAB_RESOURCE_SHARE=Application: Tabular Data Manager
TDM_RULE_SHARE=Application: Tabular Data Manager
TDM_TEMPLATE_SHARE=Application: Tabular Data Manager

11
src/main/webapp/conf/descbytype.properties
Unescape Escape View File

@ -10,18 +10,11 @@ WP_ITEM_NEW=Someone added an item in one of your workspace shared folder
WP_ADMIN_UPGRADE=Someone upgraded you as workspace shared folder admin
WP_ADMIN_DOWNGRADE=Someone downgraded you from workspace shared folder admin
OWN_COMMENT=Someone replied to your post
COMMENT=Someone replied too to a post you replied
COMMENT=Someone replied a post you also commented
MENTION=Someone mentioned you in a post
LIKE=Someone set favorite your post
LIKE=Someone liked your post
MESSAGE=Someone sent you a message
POST_ALERT=Someone shared a post enabling the email notification
DOCUMENT_WORKFLOW_EDIT=A document workflow you created was editeded
DOCUMENT_WORKFLOW_VIEW=A document workflow you created was viewed
DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Someone requested you to perform a task on his document workflow
DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Someone involved you on his document workflow
DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=A document workflow you created was forwarded to another step
DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=A document workflow you created was forwarded to the another step by all the users involved in the step
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Someone completed his task on a document workflow where you still need to do yours
CALENDAR_ADDED_EVENT=Someone added a new event in one of your shared calendars
CALENDAR_UPDATED_EVENT=Someone edited an event in one of your shared calendars
CALENDAR_DELETED_EVENT=Someone deleted an event in one of your shared calendars

8
src/main/webapp/conf/labelbytype.properties
Unescape Escape View File

@ -21,11 +21,3 @@ CALENDAR_DELETED_EVENT=Deleted events
TDM_TAB_RESOURCE_SHARE=Shared Tabular Resource
TDM_RULE_SHARE=Shared Tabular Data Manager Rule
TDM_TEMPLATE_SHARE=Shared Tabular Data Manager Template
DOCUMENT_WORKFLOW_EDIT=Edit
DOCUMENT_WORKFLOW_VIEW=View
DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Task request
DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Involvement request
DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Forward
DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Step completed
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Forward from peer

Write Preview
Loading…
Cancel
Save