gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@76416 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Francesco Mangiacrapa 2013-05-29 12:09:11 +00:00
parent 8584bc4647
commit 6829d71cc1
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
View File

@ -740,6 +740,10 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
else else
com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileDownloadEvent.getItemIdentifier(), "_self", ""); 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); notifySubscriber(fileDownloadEvent);
} }
@ -775,9 +779,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
@Override @Override
public void onCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) { public void onCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) {
doCompletedFileUploadEvent(completedFileUploadEvent); doCompletedFileUploadEvent(completedFileUploadEvent);
} }
private void doCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) { private void doCompletedFileUploadEvent(CompletedFileUploadEvent completedFileUploadEvent) {

1
src/main/java/org/gcube/portlets/user/workspace/client/event/RefreshFolderEvent.java
View File

@ -18,7 +18,6 @@ public class RefreshFolderEvent extends GwtEvent<RefreshItemEventHandler> implem
@Override @Override
public Type<RefreshItemEventHandler> getAssociatedType() { public Type<RefreshItemEventHandler> getAssociatedType() {
// TODO Auto-generated method stub
return TYPE; return TYPE;
} }

2
src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/DialogShareFolder.java
View File

@ -107,7 +107,7 @@ public class DialogShareFolder extends Dialog {
textAreaDescription.setHeight(heightTextArea); textAreaDescription.setHeight(heightTextArea);
textAreaDescription.setWidth(380); textAreaDescription.setWidth(380);
textAreaDescription.setValue(folder.getDescription()); textAreaDescription.setValue(folder.getDescription());
textAreaDescription.setReadOnly(true); // textAreaDescription.setReadOnly(true);
final LayoutContainer lc = new LayoutContainer(); final LayoutContainer lc = new LayoutContainer();
lc.setStyleAttribute("margin-top", "10px"); lc.setStyleAttribute("margin-top", "10px");

10
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
View File

@ -637,11 +637,15 @@ public class ContextMenuTree {
contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(false); //UNSHARE contextMenu.getItemByItemId(WorkspaceOperation.UNSHARE.getId()).setVisible(false); //UNSHARE
//ACCOUNTINGS //ACCOUNTINGS
if(selectedItem.isMarkAsRead()) if(selectedItem.isMarkAsRead()){
contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(true); //ACCAUNTING READ
mnRead.setIcon(Resources.getIconRead()); mnRead.setIcon(Resources.getIconRead());
else }
else{
contextMenu.getItemByItemId(WorkspaceOperation.ACCREAD.getId()).setVisible(false); //ACCAUNTING READ
mnRead.setIcon(Resources.getIconNotRead()); mnRead.setIcon(Resources.getIconNotRead());
}
if(selectedItem.isDirectory()){ if(selectedItem.isDirectory()){
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

12
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
View File

@ -1597,8 +1597,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
if(listLogin.size()>0){ if(listLogin.size()>0){
if(!isNewFolder) if(!isNewFolder){
sharedFolder = workspace.shareFolder(listLogin, folder.getIdentifier()); sharedFolder = workspace.shareFolder(listLogin, folder.getIdentifier());
sharedFolder.setDescription(folder.getDescription()); //SET NEW DESCRIPTION
}
else else
sharedFolder = workspace.createSharedFolder(folder.getName(), folder.getDescription(), listLogin, folder.getParentFileModel().getIdentifier()); 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); workspaceLogger.trace("unSharedFolderByFolderSharedId "+ folderSharedId);
try { try {
Workspace workspace = getWorkspace(); Workspace workspace = getWorkspace();
WorkspaceItem wsItem = workspace.getItem(folderSharedId); WorkspaceItem wsItem = workspace.getItem(folderSharedId);
@ -1748,8 +1751,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
workspaceLogger.trace("unShared is "+ unShared); workspaceLogger.trace("unShared is "+ unShared);
/* INTERNAL POLICY, UN SHARE NOT SHOULD PRODUCE NOTIFICATIONS
if(unShared){ if(unShared){
NotificationsProducer np = getNotificationProducer(); NotificationsProducer np = getNotificationProducer();
List<InfoContactModel> contacts = getListUserSharedByFolderSharedId(folderSharedId); List<InfoContactModel> contacts = getListUserSharedByFolderSharedId(folderSharedId);
// if(isTestMode()){ // if(isTestMode()){
@ -1761,12 +1767,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
np.notifyFolderUnSharing(contacts, unSharedFolder); np.notifyFolderUnSharing(contacts, unSharedFolder);
} }
*/
} }
else else
workspaceLogger.trace("the item with id: "+folderSharedId+ "is not "+WorkspaceItemType.SHARED_FOLDER); workspaceLogger.trace("the item with id: "+folderSharedId+ "is not "+WorkspaceItemType.SHARED_FOLDER);
} catch (InsufficientPrivilegesException e) { } catch (InternalErrorException e) {
workspaceLogger.error("Error in unSharedFolderByFolderSharedId ", e); workspaceLogger.error("Error in unSharedFolderByFolderSharedId ", e);
String error = "An error occerred on unsharing folder. "+ e.getMessage(); String error = "An error occerred on unsharing folder. "+ e.getMessage();
throw new Exception(error); throw new Exception(error);