gCubeSystem
/
workspace-explorer
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed shared folder name 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-explorer@119383 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-10-05 14:55:30 +00:00
parent 45c6302141
commit d7aabc1098
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/gcube/portlets/widgets/wsexplorer/server/ItemBuilder.java
View File

@ -83,26 +83,32 @@ public class ItemBuilder {
if (!showableTypes.contains(type)) return null;
if (!filterItem(type, workspaceItem, filterCriteria)) return null;
String itemName = workspaceItem.getName();
_log.info("Building Item for: "+itemName);
// //TODO ADD CONTROL ON THE PATH WHEN WILL BE MORE FAST
// if (itemName.equals(WorkspaceExplorerConstants.SPECIAL_FOLDERS_LABEL))
// itemName = WorkspaceExplorerConstants.VRE_FOLDERS_LABEL;
boolean isFolder = false;
if(type.equals(ItemType.FOLDER))
isFolder = true;
boolean isFolder = type.equals(ItemType.FOLDER)?true:false;
boolean isSharedFolder = workspaceItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)?true:false;
String itemName = workspaceItem.getName();
if(isSharedFolder){
_log.debug("Is shared folder");
WorkspaceSharedFolder shared = (WorkspaceSharedFolder) workspaceItem;
itemName = shared.isVreFolder()?shared.getDisplayName():workspaceItem.getName();
}
_log.debug("Building Item for: "+itemName);
//TODO ADD GET PATH WHEN WILL BE MORE FAST
Item item = new Item(parent, workspaceItem.getId(), itemName, type, "", UserUtil.getUserFullName(workspaceItem.getOwner().getPortalLogin()), isFolder, false);
item.setSharedFolder(workspaceItem.getType().equals(WorkspaceItemType.SHARED_FOLDER));
item.setSharedFolder(isSharedFolder);
if(loadChildren){
for (WorkspaceItem child: workspaceItem.getChildren()){
_log.info("Converting child item: "+itemName);
_log.trace("Converting child item: "+itemName);
Item itemChild = getItem(item, child, showableTypes, filterCriteria, false);
_log.info("Item: "+itemName +" converted!!!");
_log.trace("Item: "+itemName +" converted!!!");
if (itemChild!=null){
item.addChild(itemChild);
}