From dc36a6176430233f83af38a5d46f37aa9d4a9899 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 13 May 2019 10:32:27 +0000 Subject: [PATCH] fixing Incident #16665 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@179381 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/AppControllerExplorer.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 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 f80984e..403925a 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 @@ -540,6 +540,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt // IF NOT CANCELLED String clickedButton = be.getButtonClicked().getItemId(); if (clickedButton.equals(Dialog.YES)) { + GWT.log("Calling unSharedFolderByFolderSharedId for id: "+folderIdentification); explorerPanel.getAsycTreePanel().mask(ConstantsExplorer.UNSHARING, ConstantsExplorer.LOADINGSTYLE); WorkspaceSharingServiceAsync.INSTANCE.unSharedFolderByFolderSharedId( @@ -1942,11 +1943,15 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt } new MessageBoxAlert("Error", caught.getMessage() + ".", null); + // System.out.println(caught.getMessage()); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( - event.getTargetParentFileModel().getIdentifier(), false); - explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( - event.getFileSourceModel().getParentFileModel().getIdentifier(), true); +// explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( +// event.getTargetParentFileModel().getIdentifier(), false); +// explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( +// event.getFileSourceModel().getParentFileModel().getIdentifier(), true); + + //FXING THE ISSUE #16665 + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); } @Override @@ -1954,8 +1959,11 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt explorerPanel.getAsycTreePanel().unmask(); if (result != null) { - if (result.getError() != null) + if (result.getError() != null) { new MessageBoxAlert("Error", result.getError(), null); + //FXING THE ISSUE #16665 + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + } explorerPanel.getAsycTreePanel().reloadTreeLevelAndExpandFolder( event.getTargetParentFileModel().getIdentifier(), true);