From a6e128d2ad10dce9e3c4dadfe7ab72b4008f6b74 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 12 Sep 2013 15:09:12 +0000 Subject: [PATCH] removed label "categorize" git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@81316 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppController.java | 22 +++++++++++++++---- .../workspace/client/ConstantsPortlet.java | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) 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 b8ccfc1..2b091ad 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 @@ -188,7 +188,7 @@ public class AppController implements SubscriberInterface { } if(folderDestinationId!=null){ - Info.display("Info", "pasting..."); +// Info.display("Info", "pasting..."); AppControllerExplorer.getEventBus().fireEvent(new PasteItemEvent(pasteItemEvent.getItemId(), folderDestinationId)); } } @@ -1271,16 +1271,30 @@ public class AppController implements SubscriberInterface { } @Override - public void refreshFolder(FileModel folderTarget) { + public void refreshFolder(FileModel folderTarget, boolean forceRefresh) { if(folderTarget!=null){ - FileModel filePath = wsPortlet.getToolBarPath().getLastParent(); + if(forceRefresh){ + + //FORCED REFRESH FOLDER + FileGridModel folder = wsPortlet.getGridGroupContainer().getFileGridModelByIdentifier(folderTarget.getIdentifier()); + + GWT.log("force refresh folder :" +folder); + + updateStoreByRpc(folderTarget); + + return; + } + + + FileModel filePath = wsPortlet.getToolBarPath().getLastParent(); if(filePath!=null){ + //REFRESH FOLDER ONLY IF IS THE LAST ITEM OF BREADCRUMB if(folderTarget.getIdentifier().compareToIgnoreCase(filePath.getIdentifier())==0){ - //REFRESH FOLDER ONLY IF IS THE LAST ITEM OF BREADCRUMB + FileGridModel folder = wsPortlet.getGridGroupContainer().getFileGridModelByIdentifier(folderTarget.getIdentifier()); GWT.log("refresh folder :" +folder); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java index dbf0ee2..305f935 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java @@ -8,7 +8,7 @@ package org.gcube.portlets.user.workspace.client; public class ConstantsPortlet { // ToolBar button - public static final String CATEGORIZE = "Categorize"; + public static final String CATEGORIZE = ""; public static final String REFRESH = "Refresh"; public static final String ADDFOLDER = "New Folder";