From 8158b8c63f01ad0e102343fd00b12167ff14e31d Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 25 Feb 2013 18:03:42 +0000 Subject: [PATCH] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@69631 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppController.java | 12 ++++++++---- .../client/view/panels/GxtSeachAndFilterPanel.java | 10 ++++------ 2 files changed, 12 insertions(+), 10 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 2ef9ec1..c671b27 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 @@ -470,10 +470,14 @@ public class AppController implements SubscriberInterface { if(isSelected){ FileModel lastParent = this.wsPortlet.getToolBarPath().getLastParent(); - boolean parentChanged = lastParent.getIdentifier().compareTo(target.getParentFileModel().getIdentifier())==0?false:true; - - //RELOAD breadcrumb only if last parent id is changed - if(parentChanged) + if(lastParent!=null){ + boolean parentChanged = lastParent.getIdentifier().compareTo(target.getParentFileModel().getIdentifier())==0?false:true; + + //RELOAD breadcrumb only if last parent id is changed + if(parentChanged) + loadBreadcrumbById(target.getIdentifier()); + } + else loadBreadcrumbById(target.getIdentifier()); // if(!(lastParent.getIdentifier().compareTo(target.getIdentifier())==0)) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java index 31b7e83..e5ba3a6 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java @@ -76,18 +76,16 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { this.cbViewScope = this.comboBoxGxt.getComboViewScope(); this.cbNameFilter = this.comboBoxGxt.getComboStringFilter(); - this.cbViewScope.setWidth(300); - this.cbViewScope.setAutoWidth(true); + this.cbViewScope.setWidth(360); +// this.cbViewScope.setAutoWidth(true); this.toolbarPathPanel = toolbarContainer; cp.add(this.toolbarPathPanel); - - hp.setStyleAttribute("padding", "2px"); this.cbViewScope.setStyleAttribute("margin-left", "5px"); - this.cbViewScope.setStyleAttribute("margin-right", "100px"); + this.cbViewScope.setStyleAttribute("margin-right", "70px"); seVisibleButtonsCancelSave(false); @@ -148,7 +146,7 @@ public class GxtSeachAndFilterPanel extends LayoutContainer { RootPanel workspace = RootPanel.get(ConstantsPortlet.WORKSPACEDIV); int leftBorder = workspace.getAbsoluteLeft(); int rootWidth = Window.getClientWidth() - 2* leftBorder; //- rightScrollBar; - hp.setWidth(rootWidth - 400); + hp.setWidth(rootWidth - 500); } public void searchText(String value){