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

Completed [Feature #11325] 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@164758 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-03-06 13:38:19 +00:00
parent a0f28dcb0e
commit bae83063f5
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.wst.common.component
View File

@ -8,9 +8,6 @@
<dependent-module archiveName="workspace-tree-widget-6.20.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK"> <dependent-module archiveName="workspace-tree-widget-6.20.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="ws-thredds-sync-widget-0.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ws-thredds-sync-widget-TRUNK/ws-thredds-sync-widget-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/> <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="workspace"/> <property name="context-root" value="workspace"/>
</wb-module> </wb-module>

1
distro/changelog.xml
View File

@ -2,6 +2,7 @@
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-18-0" <Changeset component="org.gcube.portlets-user.workspace-portlet.6-18-0"
date="2018-03-01"> date="2018-03-01">
<Change>[Task #11127] Porting to new ws-thredds engine</Change> <Change>[Task #11127] Porting to new ws-thredds engine</Change>
<Change>[Feature #11325] Workspace: add New URL feature in the context menu of right pane</Change>
</Changeset> </Changeset>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-4" <Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-4"
date="2018-01-09"> date="2018-01-09">

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

@ -1493,10 +1493,6 @@ public class AppController implements SubscriberInterface {
return wsPortlet.getBorderLayoutContainer(); return wsPortlet.getBorderLayoutContainer();
} }
// public ExplorerPanel getExplorerPanel() {
// return wsPortlet.getExplorerPanel();
// }
/** /**
* Sets the size async tree panel. * Sets the size async tree panel.
* *
@ -1587,7 +1583,12 @@ public class AppController implements SubscriberInterface {
if(uploadType.equals(WS_UPLOAD_TYPE.File)){ if(uploadType.equals(WS_UPLOAD_TYPE.File)){
GWT.log("Calling addFileToStoreById "+parentId); GWT.log("Calling addFileToStoreById "+parentId);
//IF IS OVERWRITE DELETE BEFORE THE ITEM FORM STORE //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 }else{ //is ARCHIVE
updateStoreByRpc(wsPortlet.getToolBarPath().getLastParent()); updateStoreByRpc(wsPortlet.getToolBarPath().getLastParent());
} }
@ -1603,6 +1604,7 @@ public class AppController implements SubscriberInterface {
*/ */
private boolean parentIsBreadcrumbLastParent(String parentId){ private boolean parentIsBreadcrumbLastParent(String parentId){
FileModel breadParent = wsPortlet.getToolBarPath().getLastParent(); 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; return breadParent!=null && parentId!=null && breadParent.getIdentifier().compareTo(parentId)==0;
} }
@ -1629,6 +1631,7 @@ public class AppController implements SubscriberInterface {
if(deleteCurrentItem) if(deleteCurrentItem)
wsPortlet.getGridGroupContainer().deleteItem(itemIdentifier); wsPortlet.getGridGroupContainer().deleteItem(itemIdentifier);
GWT.log("Add to store: "+result);
wsPortlet.getGridGroupContainer().addToStore(result); wsPortlet.getGridGroupContainer().addToStore(result);
// wsPortlet.getGridGroupContainer().unmask(); // wsPortlet.getGridGroupContainer().unmask();
} }