From 451646248d15d51dc1ddd69a6084352dcc242e62 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 28 Mar 2013 11:41:19 +0000 Subject: [PATCH] notifier bug fixed git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@71870 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/view/tree/ContextMenuTree.java | 2 +- .../server/notifications/NotificationsProducer.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java index c3c71d3..e27196b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java @@ -594,7 +594,7 @@ public class ContextMenuTree { contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(true); //SHARE contextMenu.getItemByItemId(WorkspaceOperation.SHOW.getId()).setVisible(false); //show contextMenu.getItemByItemId(WorkspaceOperation.REFRESH_FOLDER.getId()).setVisible(true); //refresh - if(selectedItem.isShared()){ //IS SHARED + if(selectedItem.isShared() && selectedItem.isShareable()){ //IS SHARED and SHARABLE contextMenu.getItemByItemId(WorkspaceOperation.INSERT_SHARED_FOLDER.getId()).setVisible(false); //insert shared folder contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(true); }else if(selectedItem.isRoot()){ //IS ROOT diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java index e819bbe..60c5eed 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java @@ -3,6 +3,7 @@ */ package org.gcube.portlets.user.workspace.server.notifications; +import java.util.ArrayList; import java.util.List; import org.gcube.application.framework.core.session.ASLSession; @@ -233,6 +234,10 @@ public class NotificationsProducer { } } + List listCts = new ArrayList(); + listCts.add(infoContactModel); + notifyFolderSharing(listCts, sharedFolder); //NOTIFIER NEW USER OF SHARING FOLDER + }else{ //CASE MORE THEN ONE CONTACS WAS ADDED List listLogins = UserUtil.getListLoginByInfoContactModel(listExclusiveContacts); @@ -257,6 +262,10 @@ public class NotificationsProducer { } } + + notifyFolderSharing(listExclusiveContacts, sharedFolder); //NOTIFIER NEW USER OF SHARING FOLDER + + } }