From 3e7b8ada356c3c3531bb84a5daab97c5f7739ff0 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 26 Sep 2016 10:23:52 +0000 Subject: [PATCH] removed support for document workflow notifications git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@131779 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 16 +++++++--- .project | 1 + .settings/org.eclipse.wst.common.component | 1 + pom.xml | 2 +- .../templates/SingleNotificationView.java | 31 ------------------- .../webapp/conf/categorybytype.properties | 7 ----- src/main/webapp/conf/descbytype.properties | 11 ++----- src/main/webapp/conf/labelbytype.properties | 8 ----- 8 files changed, 17 insertions(+), 60 deletions(-) diff --git a/.classpath b/.classpath index 171d5e4..b710ac4 100644 --- a/.classpath +++ b/.classpath @@ -1,19 +1,27 @@ - + - + + + + + - + + + + + @@ -30,5 +38,5 @@ - + diff --git a/.project b/.project index 39213d7..b7ef70a 100644 --- a/.project +++ b/.project @@ -55,5 +55,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature com.google.gwt.eclipse.core.gwtNature + com.liferay.ide.core.liferayNature diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 033c609..c95bedc 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,7 @@ + uses diff --git a/pom.xml b/pom.xml index c48e8f4..d14246d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user notifications war - 2.0.0-SNAPSHOT + 2.1.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 5b1741f..275ab61 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 @@ -88,23 +88,6 @@ public class SingleNotificationView extends Composite { case POST_ALERT: 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 - notificationText.setHTML(actualHTML); - break; - case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT: - goApp.setHTML(" See this New Document Workflow."); - break; - case DOCUMENT_WORKFLOW_VIEW: - goApp.setHTML(" See Users Activity."); - break; - case DOCUMENT_WORKFLOW_EDIT: - goApp.setHTML(" See Users Activity."); - break; - case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER: - goApp.setHTML(" See Users Activity."); - 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: diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties index c5d35c3..38612d0 100644 --- a/src/main/webapp/conf/categorybytype.properties +++ b/src/main/webapp/conf/categorybytype.properties @@ -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 diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties index ee69bde..e40043d 100644 --- a/src/main/webapp/conf/descbytype.properties +++ b/src/main/webapp/conf/descbytype.properties @@ -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 diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties index f79fe84..7f6282f 100644 --- a/src/main/webapp/conf/labelbytype.properties +++ b/src/main/webapp/conf/labelbytype.properties @@ -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 -