From 6829d71cc1bb2c7877de94fb10015b1482e2d043 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 29 May 2013 12:09:11 +0000 Subject: [PATCH] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@76416 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppControllerExplorer.java | 8 +++++--- .../workspace/client/event/RefreshFolderEvent.java | 1 - .../client/view/sharing/DialogShareFolder.java | 2 +- .../workspace/client/view/tree/ContextMenuTree.java | 10 +++++++--- .../workspace/server/GWTWorkspaceServiceImpl.java | 12 ++++++++++-- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 6fd2f6a..0d2e42e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -740,6 +740,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt else com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileDownloadEvent.getItemIdentifier(), "_self", ""); + + FileModel file = explorerPanel.getAsycTreePanel().getFileModelByIdentifier(fileDownloadEvent.getItemIdentifier()); + file.setMarkAsRead(true); + notifySubscriber(fileDownloadEvent); } @@ -775,9 +779,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) { - doCompletedFileUploadEvent(completedFileUploadEvent); - - + doCompletedFileUploadEvent(completedFileUploadEvent); } private void doCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/RefreshFolderEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/RefreshFolderEvent.java index a81adf8..b83d0e1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/RefreshFolderEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/event/RefreshFolderEvent.java @@ -18,7 +18,6 @@ public class RefreshFolderEvent extends GwtEvent implem @Override public Type getAssociatedType() { - // TODO Auto-generated method stub return TYPE; } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java index f10b1cb..7595de7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java @@ -107,7 +107,7 @@ public class DialogShareFolder extends Dialog { textAreaDescription.setHeight(heightTextArea); textAreaDescription.setWidth(380); textAreaDescription.setValue(folder.getDescription()); - textAreaDescription.setReadOnly(true); +// textAreaDescription.setReadOnly(true); final LayoutContainer lc = new LayoutContainer(); lc.setStyleAttribute("margin-top", "10px"); 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 f2aed9e..317b408 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 @@ -637,11 +637,15 @@ public class ContextMenuTree { contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(false); //UNSHARE //ACCOUNTINGS - if(selectedItem.isMarkAsRead()) + if(selectedItem.isMarkAsRead()){ + contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(true); //ACCAUNTING READ mnRead.setIcon(Resources.getIconRead()); - else + } + else{ + contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(false); //ACCAUNTING READ mnRead.setIcon(Resources.getIconNotRead()); - + } + if(selectedItem.isDirectory()){ contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(true); //SHARE contextMenu.getItemByItemId(WorkspaceOperation.SHOW.getId()).setVisible(false); //show diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 15c25b4..1d657fc 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1597,8 +1597,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT if(listLogin.size()>0){ - if(!isNewFolder) + if(!isNewFolder){ sharedFolder = workspace.shareFolder(listLogin, folder.getIdentifier()); + sharedFolder.setDescription(folder.getDescription()); //SET NEW DESCRIPTION + } else sharedFolder = workspace.createSharedFolder(folder.getName(), folder.getDescription(), listLogin, folder.getParentFileModel().getIdentifier()); } @@ -1730,6 +1732,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("unSharedFolderByFolderSharedId "+ folderSharedId); try { + Workspace workspace = getWorkspace(); WorkspaceItem wsItem = workspace.getItem(folderSharedId); @@ -1748,8 +1751,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("unShared is "+ unShared); + + /* INTERNAL POLICY, UN SHARE NOT SHOULD PRODUCE NOTIFICATIONS if(unShared){ NotificationsProducer np = getNotificationProducer(); + List contacts = getListUserSharedByFolderSharedId(folderSharedId); // if(isTestMode()){ @@ -1761,12 +1767,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT np.notifyFolderUnSharing(contacts, unSharedFolder); } + + */ } else workspaceLogger.trace("the item with id: "+folderSharedId+ "is not "+WorkspaceItemType.SHARED_FOLDER); - } catch (InsufficientPrivilegesException e) { + } catch (InternalErrorException e) { workspaceLogger.error("Error in unSharedFolderByFolderSharedId ", e); String error = "An error occerred on unsharing folder. "+ e.getMessage(); throw new Exception(error);