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

Task #9758: fixing 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@158703 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-11-20 09:50:22 +00:00
parent 353b67bf0a
commit 066d7a6b10
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/workspace-6.17.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/workspace-6.17.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/workspace-6.17.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/workspace-6.17.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -34,5 +34,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/workspace-6.17.1-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/workspace-6.17.2-SNAPSHOT/WEB-INF/classes"/>
</classpath>

7
distro/changelog.xml
View File

@ -1,8 +1,13 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-3"
date="2017-11-20">
<Change>Task #9758: bug fixing</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-2"
date="2017-09-13">
<Change>Incident #9676: fixed. Removed check on get sub-folder public
link when operation is performed by an administrator</Change>
link when operation is performed by an administrator
</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-1"
date="2017-05-22">

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace</artifactId>
<packaging>war</packaging>
<version>6.17.2-SNAPSHOT</version>
<version>6.17.3-SNAPSHOT</version>
<name>gCube Workspace Portlet</name>
<description>
gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs.

24
src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
View File

@ -388,7 +388,14 @@ public class GxtToolBarItemFunctionality {
public void componentSelected(ButtonEvent ce) {
final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem();
FileModel parentTarget = getDirectoryOrParent(fileGridModel);
FileModel parentTarget = getParentDirectory(fileGridModel);
if(parentTarget==null)
if(fileGridModel.isDirectory()){
GWT.log("Forcing internal pasting..");
parentTarget = fileGridModel;
}
String parentId = null;
@ -632,19 +639,20 @@ public class GxtToolBarItemFunctionality {
}
/**
* The method return input file model if is directory otherwise parent of file model.
* Gets the parent directory.
*
* @param fileModel the file model
* @return the directory or parent
* @return the parent directory
*/
private FileModel getDirectoryOrParent(FileGridModel fileModel){
private FileModel getParentDirectory(FileGridModel fileModel){
if(fileModel!=null){
if(fileModel.isDirectory())
return fileModel;
else
return fileModel.getParentFileModel();
// if(fileModel.isDirectory())
// return fileModel;
// else
return fileModel.getParentFileModel();
}
return null;