From b4a9f0d2af6ad08cf2511a340c04bf0e76c01697 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 14 May 2014 10:25:53 +0000 Subject: [PATCH] enhancements on trash git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@95664 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/model/FileTrashedModel.java | 6 +++--- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileTrashedModel.java b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileTrashedModel.java index 4b55447..9c3a826 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileTrashedModel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileTrashedModel.java @@ -105,12 +105,12 @@ public class FileTrashedModel extends FileGridModel { builder.append(orginalPath); builder.append(", deleteDate="); builder.append(deleteDate); - builder.append(", deleteUser="); + builder.append(", deletedBy="); builder.append(deletedBy); + builder.append(", getIdentifier()="); + builder.append(getIdentifier()); builder.append(", getName()="); builder.append(getName()); - builder.append(", getParentFileModel()="); - builder.append(getParentFileModel()); builder.append(", isDirectory()="); builder.append(isDirectory()); builder.append("]"); 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 2fc074d..d8e85a6 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 @@ -2900,9 +2900,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT break; case REFRESH: - result.setTrashContent(builder.buildGXTListTrashContent(trash)); - return result; - default: result.setTrashContent(builder.buildGXTListTrashContent(trash)); return result;