Revision 8c4469ce
| b/gss/src/gr/ebs/gss/client/rest/resource/FolderResource.java | ||
|---|---|---|
| 442 | 442 |
needsExpanding = newNeedsExpanding; |
| 443 | 443 |
} |
| 444 | 444 |
|
| 445 |
public boolean isShared(){
|
|
| 446 |
|
|
| 447 |
for(PermissionHolder perm : permissions){
|
|
| 448 |
if(perm.getUser() != null && !owner.equals(perm.getUser())) |
|
| 449 |
return true; |
|
| 450 |
if(perm.getGroup() != null) |
|
| 451 |
return true; |
|
| 452 |
} |
|
| 453 |
return false; |
|
| 454 |
} |
|
| 445 | 455 |
} |
| b/gss/src/gr/ebs/gss/client/tree/MyShareSubtree.java | ||
|---|---|---|
| 96 | 96 |
for (String s : folderItem.getFolderResource().getSubfolderPaths()) {
|
| 97 | 97 |
if (!s.endsWith("/"))
|
| 98 | 98 |
s = s + "/"; |
| 99 |
if (rootItem.getSharedResource().getSubfolderPaths().contains(s)) |
|
| 100 |
newPaths.add(s); |
|
| 99 |
newPaths.add(s); |
|
| 101 | 100 |
} |
| 102 | 101 |
String parentName = ""; |
| 103 | 102 |
if(folderItem.getParentItem() != null && ((DnDTreeItem)folderItem.getParentItem()).getFolderResource() != null) |
| ... | ... | |
| 109 | 108 |
@Override |
| 110 | 109 |
public void onComplete() {
|
| 111 | 110 |
List<FolderResource> res = getResult(); |
| 112 |
for (FolderResource r : res) {
|
|
| 113 |
DnDTreeItem child = (DnDTreeItem) addImageItem(folderItem, r.getName(), images.folderYellow(), true); |
|
| 114 |
child.setUserObject(r); |
|
| 115 |
child.setState(false); |
|
| 116 |
child.doDraggable(); |
|
| 117 |
if(folderItem.getState()) |
|
| 118 |
update(child); |
|
| 119 |
} |
|
| 111 |
for (FolderResource r : res) |
|
| 112 |
if(r.isShared()){
|
|
| 113 |
DnDTreeItem child = (DnDTreeItem) addImageItem(folderItem, r.getName(), images.folderYellow(), true); |
|
| 114 |
child.setUserObject(r); |
|
| 115 |
child.setState(false); |
|
| 116 |
child.doDraggable(); |
|
| 117 |
if(folderItem.getState()) |
|
| 118 |
update(child); |
|
| 119 |
} |
|
| 120 | 120 |
} |
| 121 | 121 |
|
| 122 | 122 |
@Override |
| ... | ... | |
| 188 | 188 |
@Override |
| 189 | 189 |
public void onComplete() {
|
| 190 | 190 |
FolderResource rootResource = getResult(); |
| 191 |
if(rootItem.getSharedResource().getSubfolderPaths().contains(rootResource.getUri())){
|
|
| 191 |
if(rootResource.isShared()){
|
|
| 192 | 192 |
folderItem.undoDraggable(); |
| 193 | 193 |
folderItem.updateWidget(imageItemHTML(images.folderYellow(), rootResource.getName())); |
| 194 | 194 |
folderItem.setUserObject(rootResource); |
| b/gss/src/gr/ebs/gss/server/rest/SharedHandler.java | ||
|---|---|---|
| 80 | 80 |
parentUrl = parentUrl + owner.getUsername() + PATH_FILES; |
| 81 | 81 |
|
| 82 | 82 |
List<JSONObject> subfolders = new ArrayList<JSONObject>(); |
| 83 |
List<FolderDTO> folders = getService().getSharedFolders(owner.getId()); |
|
| 83 |
List<FolderDTO> folders = getService().getSharedRootFolders(owner.getId());
|
|
| 84 | 84 |
for (FolderDTO f: folders) {
|
| 85 | 85 |
JSONObject j = new JSONObject(); |
| 86 | 86 |
j.put("name", f.getName()).
|
Also available in: Unified diff