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
This commit is contained in:
parent
c0bf5198bb
commit
451646248d
|
@ -594,7 +594,7 @@ public class ContextMenuTree {
|
||||||
contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(true); //SHARE
|
contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(true); //SHARE
|
||||||
contextMenu.getItemByItemId(WorkspaceOperation.SHOW.getId()).setVisible(false); //show
|
contextMenu.getItemByItemId(WorkspaceOperation.SHOW.getId()).setVisible(false); //show
|
||||||
contextMenu.getItemByItemId(WorkspaceOperation.REFRESH_FOLDER.getId()).setVisible(true); //refresh
|
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.INSERT_SHARED_FOLDER.getId()).setVisible(false); //insert shared folder
|
||||||
contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(true);
|
contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(true);
|
||||||
}else if(selectedItem.isRoot()){ //IS ROOT
|
}else if(selectedItem.isRoot()){ //IS ROOT
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
*/
|
*/
|
||||||
package org.gcube.portlets.user.workspace.server.notifications;
|
package org.gcube.portlets.user.workspace.server.notifications;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.gcube.application.framework.core.session.ASLSession;
|
import org.gcube.application.framework.core.session.ASLSession;
|
||||||
|
@ -233,6 +234,10 @@ public class NotificationsProducer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<InfoContactModel> listCts = new ArrayList<InfoContactModel>();
|
||||||
|
listCts.add(infoContactModel);
|
||||||
|
notifyFolderSharing(listCts, sharedFolder); //NOTIFIER NEW USER OF SHARING FOLDER
|
||||||
|
|
||||||
}else{ //CASE MORE THEN ONE CONTACS WAS ADDED
|
}else{ //CASE MORE THEN ONE CONTACS WAS ADDED
|
||||||
|
|
||||||
List<String> listLogins = UserUtil.getListLoginByInfoContactModel(listExclusiveContacts);
|
List<String> listLogins = UserUtil.getListLoginByInfoContactModel(listExclusiveContacts);
|
||||||
|
@ -257,6 +262,10 @@ public class NotificationsProducer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
notifyFolderSharing(listExclusiveContacts, sharedFolder); //NOTIFIER NEW USER OF SHARING FOLDER
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue