gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@71734 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Francesco Mangiacrapa 2013-03-25 17:36:34 +00:00
parent 4858405235
commit d8c64c7990
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -90,7 +90,8 @@ public class AppController implements SubscriberInterface {
private WorskpacePortlet wsPortlet = null; private WorskpacePortlet wsPortlet = null;
private AppControllerExplorer appContrExplorer = null; private AppControllerExplorer appContrExplorer = null;
private String rootIdentifier = null; private String rootIdentifier = null;
public static boolean isSearchActive = false; // public static boolean isSearchActive = false;
public AppController(AppControllerExplorer appControllerExplorer) { public AppController(AppControllerExplorer appControllerExplorer) {
this.appContrExplorer = appControllerExplorer; this.appContrExplorer = appControllerExplorer;
@ -337,7 +338,7 @@ public class AppController implements SubscriberInterface {
} }
else{ else{
wsPortlet.getSearchAndFilterContainer().setSearchActive(true); //ADDED 06-04-12 wsPortlet.getSearchAndFilterContainer().setSearchActive(true); //ADDED 06-04-12
isSearchActive = true; // setSearchActive(true);
appContrExplorer.searching(true); appContrExplorer.searching(true);
doSearchText(searchTextEvent.getTextSearch()); doSearchText(searchTextEvent.getTextSearch());
} }
@ -440,7 +441,7 @@ public class AppController implements SubscriberInterface {
if(fileUploadEvent.getParentFileModel()!=null){ if(fileUploadEvent.getParentFileModel()!=null){
parent = fileUploadEvent.getParentFileModel(); parent = fileUploadEvent.getParentFileModel();
GWT.log("get parent item for uploading from parent of file model: " +fileUploadEvent.getParentFileModel().getName()); GWT.log("get parent item for uploading from parent of file model: " +fileUploadEvent.getParentFileModel().getName());
}else if(wsPortlet.getGridGroupContainer().getCurrentFolderView()!=null && !isSearchActive){ }else if(wsPortlet.getGridGroupContainer().getCurrentFolderView()!=null && !wsPortlet.getSearchAndFilterContainer().isSearchActive()){
parent = wsPortlet.getGridGroupContainer().getCurrentFolderView(); parent = wsPortlet.getGridGroupContainer().getCurrentFolderView();
GWT.log("get parent item for uploading from CurrentFolderView: " +parent.getName()); GWT.log("get parent item for uploading from CurrentFolderView: " +parent.getName());
}else if(wsPortlet.getToolBarPath().getLastParent()!=null){ }else if(wsPortlet.getToolBarPath().getLastParent()!=null){
@ -448,7 +449,7 @@ public class AppController implements SubscriberInterface {
GWT.log("get parent item for uploading from breadcrumb: " +parent.getName()); GWT.log("get parent item for uploading from breadcrumb: " +parent.getName());
} }
AppControllerExplorer.getEventBus().fireEvent(new FileUploadEvent(fileUploadEvent.getParentFileModel(),fileUploadEvent.getUploadType())); AppControllerExplorer.getEventBus().fireEvent(new FileUploadEvent(parent,fileUploadEvent.getUploadType()));
} }
}); });
@ -525,6 +526,15 @@ public class AppController implements SubscriberInterface {
} }
// public static boolean isSearchActive() {
// return isSearchActive;
// }
//
// public static void setSearchActive(boolean isSearchActive) {
// AppController.isSearchActive = isSearchActive;
// }
/** /**
* *
* @param item * @param item
@ -728,7 +738,7 @@ public class AppController implements SubscriberInterface {
wsPortlet.getSearchAndFilterContainer().searchCancel(); //TODO added in 05/04/2012 wsPortlet.getSearchAndFilterContainer().searchCancel(); //TODO added in 05/04/2012
AppController.getEventBus().fireEvent(new SearchTextEvent(null)); AppController.getEventBus().fireEvent(new SearchTextEvent(null));
wsPortlet.getSearchAndFilterContainer().setSearchActive(false); wsPortlet.getSearchAndFilterContainer().setSearchActive(false);
isSearchActive = false; // setSearchActive(false);
if(item.isDirectory()) if(item.isDirectory())
updateStoreByRpc(item); updateStoreByRpc(item);
else else
@ -802,7 +812,7 @@ public class AppController implements SubscriberInterface {
@Override @Override
public void onSuccess(List<FileGridModel> result) { public void onSuccess(List<FileGridModel> result) {
wsPortlet.getSearchAndFilterContainer().setSearchActive(true); wsPortlet.getSearchAndFilterContainer().setSearchActive(true);
isSearchActive = true; // setSearchActive(true);
wsPortlet.getGridGroupContainer().unmask(); wsPortlet.getGridGroupContainer().unmask();
wsPortlet.getGridGroupContainer().updateStore(result); wsPortlet.getGridGroupContainer().updateStore(result);
} }