From fe4e932f55894fddce4d28f2e45ba9ee842a83f6 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Tue, 30 Sep 2014 10:36:15 +0000 Subject: [PATCH] integrated notifications for set/unset shared folder administrator git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@100276 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 4 ++-- .settings/com.google.gdt.eclipse.core.prefs | 2 +- .../client/view/templates/SingleNotificationView.java | 2 ++ src/main/webapp/conf/categorybytype.properties | 2 ++ src/main/webapp/conf/descbytype.properties | 2 ++ src/main/webapp/conf/labelbytype.properties | 2 ++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.classpath b/.classpath index 66784d0..9979f37 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -30,5 +30,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index bea6ff2..85f8b61 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-1.3.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-1.3.1-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false 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 b5a61ff..0372c4c 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 @@ -108,6 +108,8 @@ public class SingleNotificationView extends Composite { case WP_ITEM_NEW: case WP_ITEM_RENAMED: case WP_ITEM_UPDATED: + case WP_ADMIN_UPGRADE: + case WP_ADMIN_DOWNGRADE: goApp.setHTML(" Go to Folder."); break; case CALENDAR_ADDED_EVENT: diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties index ebdfe63..3c9d8ec 100644 --- a/src/main/webapp/conf/categorybytype.properties +++ b/src/main/webapp/conf/categorybytype.properties @@ -7,6 +7,8 @@ DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Document Workflow DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Document Workflow WP_FOLDER_SHARE=Workspace Sharing WP_FOLDER_UNSHARE=Workspace Sharing +WP_ADMIN_UPGRADE=Workspace Sharing +WP_ADMIN_DOWNGRADE=Workspace Sharing WP_FOLDER_ADDEDUSER=Workspace Sharing WP_FOLDER_REMOVEDUSER=Workspace Sharing WP_FOLDER_RENAMED=Workspace Sharing diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties index a2e19fa..0698d96 100644 --- a/src/main/webapp/conf/descbytype.properties +++ b/src/main/webapp/conf/descbytype.properties @@ -7,6 +7,8 @@ WP_ITEM_DELETE=Someone deleted an item in one of your workspace shared folder WP_ITEM_UPDATED=Someone updated an item in one of your workspace shared folder WP_ITEM_RENAMED=Someone renamed an item in one of your workspace shared folder WP_ITEM_NEW=Someone added an item in one of your workspace shared folder +WP_ADMIN_UPGRADE=Someone upgraded you as workspace shared folder administrator +WP_ADMIN_DOWNGRADE=Someone downgraded you from workspace shared folder administrator OWN_COMMENT=Someone replied to your post COMMENT=Someone replied too to a post you replied MENTION=Someone mentioned you in a post diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties index 4505e1b..0b1a547 100644 --- a/src/main/webapp/conf/labelbytype.properties +++ b/src/main/webapp/conf/labelbytype.properties @@ -7,6 +7,8 @@ WP_ITEM_DELETE=Shared item deleted WP_ITEM_UPDATED=Shared item updated WP_ITEM_RENAMED=Shared item renamed WP_ITEM_NEW=Shared item added +WP_ADMIN_UPGRADE=Folder admin upgrade +WP_ADMIN_DOWNGRADE=Folder admin downgrade OWN_COMMENT=Own replies COMMENT=Replies MENTION=Mentions