From bae83063f59b3dab4c44bd91e3d75372afc0d131 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 6 Mar 2018 13:38:19 +0000 Subject: [PATCH] Completed [Feature #11325] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@164758 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 --- distro/changelog.xml | 1 + .../user/workspace/client/AppController.java | 13 ++++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 71d313e..fd3e0d8 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -8,9 +8,6 @@ uses - - uses - diff --git a/distro/changelog.xml b/distro/changelog.xml index e7e002e..d0651a0 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,6 +2,7 @@ [Task #11127] Porting to new ws-thredds engine + [Feature #11325] Workspace: add New URL feature in the context menu of right pane diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index 2d71eac..0de38e5 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -1493,10 +1493,6 @@ public class AppController implements SubscriberInterface { return wsPortlet.getBorderLayoutContainer(); } - // public ExplorerPanel getExplorerPanel() { - // return wsPortlet.getExplorerPanel(); - // } - /** * Sets the size async tree panel. * @@ -1587,7 +1583,12 @@ public class AppController implements SubscriberInterface { if(uploadType.equals(WS_UPLOAD_TYPE.File)){ GWT.log("Calling addFileToStoreById "+parentId); //IF IS OVERWRITE DELETE BEFORE THE ITEM FORM STORE - addFileToStoreById(itemIdentifier, parentId, isOverwrite); + if(itemIdentifier!=null) + addFileToStoreById(itemIdentifier, parentId, isOverwrite); + else{ + //IS AN ADD URL? + + } }else{ //is ARCHIVE updateStoreByRpc(wsPortlet.getToolBarPath().getLastParent()); } @@ -1603,6 +1604,7 @@ public class AppController implements SubscriberInterface { */ private boolean parentIsBreadcrumbLastParent(String parentId){ FileModel breadParent = wsPortlet.getToolBarPath().getLastParent(); + GWT.log("Comparing parentId: "+parentId +" and bread parent: "+breadParent.getIdentifier()); return breadParent!=null && parentId!=null && breadParent.getIdentifier().compareTo(parentId)==0; } @@ -1629,6 +1631,7 @@ public class AppController implements SubscriberInterface { if(deleteCurrentItem) wsPortlet.getGridGroupContainer().deleteItem(itemIdentifier); + GWT.log("Add to store: "+result); wsPortlet.getGridGroupContainer().addToStore(result); // wsPortlet.getGridGroupContainer().unmask(); }