fixed #1333
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@122157 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
203b855e1f
commit
5cf7a20068
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" output="target/workspace-6.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<classpathentry kind="src" output="target/workspace-6.10.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
|
|
@ -26,5 +26,5 @@
|
|||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/workspace-6.10.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
<classpathentry kind="output" path="target/workspace-6.10.1-SNAPSHOT/WEB-INF/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,13 @@
|
|||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
<dependent-module archiveName="workspace-explorer-1.1.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-explorer/workspace-explorer">
|
||||
<dependent-module archiveName="workspace-tree-widget-6.10.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="workspace-sharing-widget-1.5.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-sharing-widget-TRUNK/workspace-sharing-widget-TRUNK">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="workspace-uploader-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-TRUNK/workspace-uploader-TRUNK">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
|
||||
|
|
|
|||
|
|
@ -1131,24 +1131,19 @@ public class AppController implements SubscriberInterface {
|
|||
* @param includeItemAsParent the include item as parent
|
||||
*/
|
||||
protected void loadParentBreadcrumbByItemId(final String childItemId, boolean includeItemAsParent){
|
||||
|
||||
GWT.log("Reload Parent Breadcrumb: [Item id: "+childItemId+"]");
|
||||
|
||||
AppControllerExplorer.rpcWorkspaceService.getListParentsByItemIdentifier(childItemId, includeItemAsParent, new AsyncCallback<List<FileModel>>() {
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable caught) {
|
||||
GWT.log("failure get list parents by item identifier "+caught);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(List<FileModel> result) {
|
||||
|
||||
updateBreadcrumb(result); //Set file path in tab panel on current item selected
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1167,7 +1162,7 @@ public class AppController implements SubscriberInterface {
|
|||
GWT.log("Updated Breadcrumb for : "+parent);
|
||||
|
||||
if(parent!=null){
|
||||
wsPortlet.getBorderLayoutContainer().updateParentId(parent.getIdentifier());
|
||||
wsPortlet.getBorderLayoutContainer().updateDnDParentId(parent.getIdentifier());
|
||||
|
||||
if(parent.isDirectory() && parent.isShared()){ //IS SHARED FOLDER, ENABLING OPERATION FOR ACTIVE BREADCRUMB
|
||||
setACLInfo(parent.getIdentifier());
|
||||
|
|
@ -1181,7 +1176,7 @@ public class AppController implements SubscriberInterface {
|
|||
setACLInfo(null); //IS NOT A SHARE FOLDER DOSN'T DISPLAY ACL INFO
|
||||
}
|
||||
}else{
|
||||
wsPortlet.getBorderLayoutContainer().updateParentId(null);
|
||||
wsPortlet.getBorderLayoutContainer().updateDnDParentId(null);
|
||||
setACLInfo(null);
|
||||
}
|
||||
|
||||
|
|
@ -1206,14 +1201,11 @@ public class AppController implements SubscriberInterface {
|
|||
@Override
|
||||
public void onFailure(Throwable arg0) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onSuccess(List<ExtendedWorkspaceACL> res) {
|
||||
|
||||
FileModel parent = wsPortlet.getToolBarPath().getLastParent();
|
||||
|
||||
GWT.log("Validating correct ACL id: "+parentId +" and "+parent.getIdentifier());
|
||||
if(parentId.compareTo(parent.getIdentifier())==0){
|
||||
if(res!=null && res.size()>0){
|
||||
|
|
@ -1295,7 +1287,7 @@ public class AppController implements SubscriberInterface {
|
|||
@Override
|
||||
public void onOverwriteCompleted(String parentId, String itemId) {
|
||||
GWT.log("Upload Override Completed: [parentID: "+parentId+", itemId: "+itemId+"]");
|
||||
eventBus.fireEvent(new CompletedFileUploadEvent(parentId, itemId, WS_UPLOAD_TYPE.File, true));
|
||||
AppControllerExplorer.getEventBus().fireEvent(new CompletedFileUploadEvent(parentId, itemId, WS_UPLOAD_TYPE.File, true));
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -100,12 +100,10 @@ public class GxtBorderLayoutPanel extends ContentPanel {
|
|||
setLayout(borderLayout);
|
||||
//setStyleAttribute("padding", "10px");
|
||||
setHeaderVisible(false);
|
||||
|
||||
// center.add(this.gridFilter);
|
||||
|
||||
BorderLayoutData northData = new BorderLayoutData(LayoutRegion.NORTH, 60, 60, 60);
|
||||
northData.setCollapsible(true);
|
||||
|
||||
northData.setSplit(true); //Split bar between regions
|
||||
// northData.setFloatable(true);
|
||||
northData.setCollapsible(true);
|
||||
|
|
@ -134,8 +132,7 @@ public class GxtBorderLayoutPanel extends ContentPanel {
|
|||
north.add(this.searchAndFilterContainer);
|
||||
north.setScrollMode(Scroll.AUTOY);
|
||||
west.add(this.expPanel);
|
||||
|
||||
|
||||
|
||||
north.addListener(Events.Resize, new Listener<BoxComponentEvent>(){
|
||||
|
||||
@Override
|
||||
|
|
@ -172,33 +169,24 @@ public class GxtBorderLayoutPanel extends ContentPanel {
|
|||
}
|
||||
});
|
||||
// center.add(this.toolbarContainer);
|
||||
|
||||
center.setId("Center Panel "+Random.nextInt());
|
||||
// GWT.log("center: "+center.getId());
|
||||
dnd.addUniqueContainer(this.gxtCardLayoutResultPanel);
|
||||
center.add(dnd);
|
||||
|
||||
// south.add(this.toolBarItemDetails);
|
||||
|
||||
west.addListener(Events.Resize, new Listener<BoxComponentEvent>(){
|
||||
|
||||
@Override
|
||||
public void handleEvent(BoxComponentEvent be) {
|
||||
|
||||
expPanel.getAsycTreePanel().setSizeTreePanel(expPanel.getWidth()-13, expPanel.getHeight()-39);
|
||||
|
||||
if(expPanel.getSmartFolderPanel()!=null)
|
||||
expPanel.getSmartFolderPanel().setSizeSmartPanel(expPanel.getWidth()-2, expPanel.getHeight()-29);
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
add(north, northData);
|
||||
add(west, westData);
|
||||
add(center, centerData);
|
||||
add(east, eastData);
|
||||
// add(south, southData);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -220,7 +208,7 @@ public class GxtBorderLayoutPanel extends ContentPanel {
|
|||
*
|
||||
* @param parentId the parent id
|
||||
*/
|
||||
public void updateParentId(String parentId){
|
||||
public void updateDnDParentId(String parentId){
|
||||
dnd.setParameters(parentId, UPLOAD_TYPE.File);
|
||||
}
|
||||
}
|
||||
|
|
@ -85,6 +85,16 @@
|
|||
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>workspaceUploaderWsUtil</servlet-name>
|
||||
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderWsUtil</servlet-class>
|
||||
</servlet>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>workspaceUploaderWsUtil</servlet-name>
|
||||
<url-pattern>/workspace/workspaceUploaderWsUtil</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>workspaceExplorer</servlet-name>
|
||||
<url-pattern>/workspace/WorkspaceExplorerService</url-pattern>
|
||||
|
|
|
|||
Loading…
Reference in New Issue