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

Updated pom version at 6.28.0 

Merged with branch version released for gCube 4.15
Changed the checks before sending notification

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@182226 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2019-11-07 11:14:41 +00:00
parent d7259a788f
commit 67aa4936ec
5 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distro/changelog.xml
View File

@ -1,4 +1,12 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset
component="org.gcube.portlets-user.workspace-portlet-tree.6-28-0"
date="${buildDate}">
<Change>Merged with branch version
</Change>
<Change>Changed shared folder check to send notification
</Change>
</Changeset>
<Changeset <Changeset
component="org.gcube.portlets-user.workspace-portlet-tree.6-27-0" component="org.gcube.portlets-user.workspace-portlet-tree.6-27-0"
date="${buildDate}"> date="${buildDate}">

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-tree-widget</artifactId> <artifactId>workspace-tree-widget</artifactId>
<version>6.27.0-SNAPSHOT</version> <version>6.28.0-SNAPSHOT</version>
<name>gCube Workspace Tree Widget</name> <name>gCube Workspace Tree Widget</name>
<description> <description>
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace

5
src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
View File

@ -11,6 +11,7 @@ import org.gcube.portlets.user.workspace.client.resources.Resources;
import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel; import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
import com.extjs.gxt.ui.client.data.BaseModelData; import com.extjs.gxt.ui.client.data.BaseModelData;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.IsSerializable; import com.google.gwt.user.client.rpc.IsSerializable;
import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
@ -295,7 +296,7 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
*/ */
public AbstractImagePrototype getAbstractPrototypeIcon() { public AbstractImagePrototype getAbstractPrototypeIcon() {
//GWT.log("My prop: "+this.toString()); GWT.log("My prop: "+this.toString());
AbstractImagePrototype absImgPr = Resources.getIconTable(); AbstractImagePrototype absImgPr = Resources.getIconTable();
@ -321,7 +322,7 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
if(this.isPublic()) //IS PLUBIC if(this.isPublic()) //IS PLUBIC
absImgPr = Resources.getIconFolderPublic(); absImgPr = Resources.getIconFolderPublic();
else else
absImgPr = Resources.getIconFolder(); //IS A PRIVATE FOLDER absImgPr = Resources.getIconSharedFolder(); //IS A SHARED FOLDER DESCENDANT OF ROOT SHARED FOLDER
} }
} }

38
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
View File

@ -209,7 +209,7 @@ public class AsyncTreePanel extends LayoutContainer {
if(model.isPublic()) //IS PLUBIC if(model.isPublic()) //IS PLUBIC
return Resources.getIconFolderPublic(); return Resources.getIconFolderPublic();
else else
return Resources.getIconFolder(); return Resources.getIconSharedFolder(); //IS CHILDREN OF ROOT SHARED FOLDER
} }
} }
@ -347,42 +347,6 @@ public class AsyncTreePanel extends LayoutContainer {
loadRootInStore(result, selectRoot); loadRootInStore(result, selectRoot);
} }
}); });
// if(this.scopeId !=null){
// //Load Root with specific scope id
// AppControllerExplorer.rpcWorkspaceService.getRootForTree(scopeId, new AsyncCallback<FolderModel>() {
//
// @Override
// public void onFailure(Throwable caught) {
// new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting root item. " +ConstantsExplorer.TRY_AGAIN, null);
//
// }
//
// @Override
// public void onSuccess(FolderModel result) {
// loadRootInStore(result, selectRoot);
//
// }
// });
// }
//
// else{
// //Load Root without filtering on scope id
// AppControllerExplorer.rpcWorkspaceService.getRootForTree(new AsyncCallback<FolderModel>() {
//
// @Override
// public void onFailure(Throwable caught) {
// new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " getting root item. " +ConstantsExplorer.TRY_AGAIN, null);
//
// }
//
// @Override
// public void onSuccess(FolderModel result) {
// loadRootInStore(result, selectRoot);
// }
// });
// }
} }

6
src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java
View File

@ -132,7 +132,8 @@ public class ObjectStorageHubToWorkpaceMapper {
break; break;
default: default:
logger.error("ALERT Conversion RETURNING null for item "+wrappedItem.getName()); logger.warn("Default conversion to base item for item: "+wrappedItem);
fileModel = new FileModel(wrappedItem.getId(), wrappedItem.getName(), parentFolderModel, wrappedItem.isFolder(), wrappedItem.isShared());
break; break;
} }
@ -238,7 +239,8 @@ public class ObjectStorageHubToWorkpaceMapper {
break; break;
default: default:
logger.error("gxt conversion return null for item "+wrappedItem.getName()); logger.warn("Default conversion to base item for item: "+wrappedItem);
fileGridModel = new FileGridModel(wrappedItem.getId(), wrappedItem.getName(), FormatterUtil.toDate(wrappedItem.getLastModificationTime()), parentFolderModel, -1, wrappedItem.isFolder(), wrappedItem.isShared());
break; break;
} }