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:
parent
353b67bf0a
commit
066d7a6b10
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<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>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -34,5 +34,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
</classpath>
|
||||||
|
|
|
@ -1,8 +1,13 @@
|
||||||
<ReleaseNotes>
|
<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"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-2"
|
||||||
date="2017-09-13">
|
date="2017-09-13">
|
||||||
<Change>Incident #9676: fixed. Removed check on get sub-folder public
|
<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>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-1"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-1"
|
||||||
date="2017-05-22">
|
date="2017-05-22">
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -11,7 +11,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>workspace</artifactId>
|
<artifactId>workspace</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>6.17.2-SNAPSHOT</version>
|
<version>6.17.3-SNAPSHOT</version>
|
||||||
<name>gCube Workspace Portlet</name>
|
<name>gCube Workspace Portlet</name>
|
||||||
<description>
|
<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.
|
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.
|
||||||
|
|
|
@ -388,7 +388,14 @@ public class GxtToolBarItemFunctionality {
|
||||||
public void componentSelected(ButtonEvent ce) {
|
public void componentSelected(ButtonEvent ce) {
|
||||||
|
|
||||||
final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem();
|
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;
|
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
|
* @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!=null){
|
||||||
if(fileModel.isDirectory())
|
// if(fileModel.isDirectory())
|
||||||
return fileModel;
|
// return fileModel;
|
||||||
else
|
// else
|
||||||
return fileModel.getParentFileModel();
|
return fileModel.getParentFileModel();
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue