added unshare folder handling

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@100268 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2014-09-29 16:48:55 +00:00
parent cc9e924d89
commit b74feb5253
7 changed files with 10 additions and 6 deletions

View File

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

View File

@ -100,6 +100,7 @@ public class SingleNotificationView extends Composite {
goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>"); goApp.setHTML("<a class=\"link\" href=\""+toShow.getUri()+"\"> See Users Activity.</a>");
break; break;
case WP_FOLDER_SHARE: case WP_FOLDER_SHARE:
case WP_FOLDER_UNSHARE:
case WP_FOLDER_ADDEDUSER: case WP_FOLDER_ADDEDUSER:
case WP_FOLDER_REMOVEDUSER: case WP_FOLDER_REMOVEDUSER:
case WP_FOLDER_RENAMED: case WP_FOLDER_RENAMED:
@ -128,17 +129,14 @@ public class SingleNotificationView extends Composite {
case MESSAGE: case MESSAGE:
return images.message(); return images.message();
case WP_FOLDER_ADDEDUSER: case WP_FOLDER_ADDEDUSER:
return images.share();
case WP_FOLDER_REMOVEDUSER: case WP_FOLDER_REMOVEDUSER:
return images.share();
case WP_FOLDER_SHARE: case WP_FOLDER_SHARE:
return images.share();
case WP_ITEM_NEW: case WP_ITEM_NEW:
return images.share();
case WP_ITEM_DELETE: case WP_ITEM_DELETE:
return images.share();
case WP_ITEM_UPDATED: case WP_ITEM_UPDATED:
return images.share(); return images.share();
case WP_FOLDER_UNSHARE:
return images.unshare();
case OWN_COMMENT: case OWN_COMMENT:
return images.comment(); return images.comment();
case REQUEST_CONNECTION: case REQUEST_CONNECTION:

View File

@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle {
@Source("share_blue.png") @Source("share_blue.png")
ImageResource share(); ImageResource share();
@Source("unshare_blue.png")
ImageResource unshare();
@Source("connection_new.png") @Source("connection_new.png")
ImageResource connectionRequest(); ImageResource connectionRequest();

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -6,6 +6,7 @@ DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=Document Workflow
DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Document Workflow DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=Document Workflow
DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Document Workflow DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Document Workflow
WP_FOLDER_SHARE=Workspace Sharing WP_FOLDER_SHARE=Workspace Sharing
WP_FOLDER_UNSHARE=Workspace Sharing
WP_FOLDER_ADDEDUSER=Workspace Sharing WP_FOLDER_ADDEDUSER=Workspace Sharing
WP_FOLDER_REMOVEDUSER=Workspace Sharing WP_FOLDER_REMOVEDUSER=Workspace Sharing
WP_FOLDER_RENAMED=Workspace Sharing WP_FOLDER_RENAMED=Workspace Sharing

View File

@ -1,4 +1,5 @@
WP_FOLDER_SHARE=Sharing of workspace folders with you WP_FOLDER_SHARE=Sharing of workspace folders with you
WP_FOLDER_UNSHARE=Someone unshared a folder of yours form his workspace
WP_FOLDER_ADDEDUSER=Someone added users one to one of your workspace shared folder WP_FOLDER_ADDEDUSER=Someone added users one to one of your workspace shared folder
WP_FOLDER_REMOVEDUSER=Someone removed users from one of your workspace shared folder WP_FOLDER_REMOVEDUSER=Someone removed users from one of your workspace shared folder
WP_FOLDER_RENAMED=Someone renamed one of your workspace shared folder WP_FOLDER_RENAMED=Someone renamed one of your workspace shared folder

View File

@ -1,4 +1,5 @@
WP_FOLDER_SHARE=Shared folder WP_FOLDER_SHARE=Shared folder
WP_FOLDER_UNSHARE=Unshared folder
WP_FOLDER_ADDEDUSER=User added to shared folder WP_FOLDER_ADDEDUSER=User added to shared folder
WP_FOLDER_REMOVEDUSER=User removed from shared folder WP_FOLDER_REMOVEDUSER=User removed from shared folder
WP_FOLDER_RENAMED=Shared folder renamed WP_FOLDER_RENAMED=Shared folder renamed