From fed1203e4d3dc25729a9e3f3be68c6e208c515f2 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 14 May 2014 10:14:07 +0000 Subject: [PATCH] enhancements on trash git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@95661 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/workspace/server/GWTWorkspaceBuilder.java | 2 +- .../portlets/user/workspace/server/GWTWorkspaceServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 6330375..5c89f13 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -2235,7 +2235,7 @@ public class GWTWorkspaceBuilder { FileTrashedModel fileTrashModel = new FileTrashedModel(); fileTrashModel.setName(trashedItem.getName()); - fileTrashModel.setIdentifier(trashedItem.getOriginalParentId()); //TODO + fileTrashModel.setIdentifier(trashedItem.getId()); //TODO //SETTING PARENT FileModel oldParent = new FileModel(trashedItem.getOriginalParentId(), "", true); 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 4aa8386..2fc074d 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 @@ -2947,8 +2947,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspace = getWorkspace(); WorkspaceTrashFolder trash = workspace.getTrash(); - GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); TrashOperationContent result = new TrashOperationContent(); + result.setOperation(operation); List listUpdatedTrashIds = new ArrayList();