Revision c83883e3
| b/src/gr/ebs/gss/client/CellTreeViewModel.java | ||
|---|---|---|
| 290 | 290 |
DragAndDropNodeInfo<RestResource> n = new DragAndDropNodeInfo<RestResource>(dataProvider, departmentCell, |
| 291 | 291 |
selectionModel, new ResourceValueUpdater()); |
| 292 | 292 |
//nodeInfos.put(((OthersFolderResource) value).getUri(), n); |
| 293 |
othersmap.put(((SharedFolderResource) value).getUri(), dataProvider);
|
|
| 293 |
othersmap.put(((OthersFolderResource) value).getUri(), dataProvider);
|
|
| 294 | 294 |
configureFolderDrop(n); |
| 295 | 295 |
configureDragOperation(n.getDraggableOptions()); |
| 296 | 296 |
return n; |
| ... | ... | |
| 432 | 432 |
}); |
| 433 | 433 |
} |
| 434 | 434 |
else if(value instanceof OthersFolderResource){
|
| 435 |
|
|
| 435 |
GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, value.getUri(), null) {
|
|
| 436 |
|
|
| 437 |
@Override |
|
| 438 |
public void onComplete() {
|
|
| 439 |
FolderResource rootResource = getResult(); |
|
| 440 |
//((MyFolderResource)value).getResource().setFiles(rootResource.getFiles()); |
|
| 441 |
((OthersFolderResource)value).setResource(rootResource); |
|
| 442 |
if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri())) |
|
| 443 |
selectionModel.setSelected(value, true); |
|
| 444 |
GSS.get().onResourceUpdate(value); |
|
| 445 |
|
|
| 446 |
} |
|
| 447 |
|
|
| 448 |
@Override |
|
| 449 |
public void onError(Throwable t) {
|
|
| 450 |
GWT.log("Error fetching root folder", t);
|
|
| 451 |
GSS.get().displayError("Unable to fetch root folder");
|
|
| 452 |
} |
|
| 453 |
|
|
| 454 |
}; |
|
| 455 |
DeferredCommand.addCommand(gf); |
|
| 436 | 456 |
} |
| 437 | 457 |
|
| 438 | 458 |
} |
| b/src/gr/ebs/gss/client/FileList.java | ||
|---|---|---|
| 22 | 22 |
import gr.ebs.gss.client.rest.GetCommand; |
| 23 | 23 |
import gr.ebs.gss.client.rest.RestCommand; |
| 24 | 24 |
import gr.ebs.gss.client.rest.resource.FileResource; |
| 25 |
import gr.ebs.gss.client.rest.resource.OtherUserResource; |
|
| 26 |
import gr.ebs.gss.client.rest.resource.OthersFolderResource; |
|
| 25 | 27 |
import gr.ebs.gss.client.rest.resource.RestResource; |
| 26 | 28 |
import gr.ebs.gss.client.rest.resource.RestResourceWrapper; |
| 27 | 29 |
import gr.ebs.gss.client.rest.resource.SharedResource; |
| ... | ... | |
| 593 | 595 |
} else {
|
| 594 | 596 |
showingStats = "" + (startIndex + 1) + " - " + max + " of " + count + " files" + " (" + FileResource.getFileSizeAsString(folderTotalSize) + ")";
|
| 595 | 597 |
} |
| 598 |
showCellTable(); |
|
| 596 | 599 |
updateCurrentlyShowingStats(); |
| 597 | 600 |
|
| 598 | 601 |
} |
| ... | ... | |
| 606 | 609 |
private ImageResource getFileIcon(FileResource file) {
|
| 607 | 610 |
String mimetype = file.getContentType(); |
| 608 | 611 |
boolean shared = false; |
| 609 |
//TODO: FETCH USER OF OTHER FOLDER ITEM |
|
| 610 |
//if(GSS.get().getTreeView().getSelection()!=null && (GSS.get().getTreeView().getSelection() instanceof OtherUserResource || GSS.get().getTreeView().getSelection() instanceof OthersFolderResource)) |
|
| 611 |
/*Folders folders = GSS.get().getFolders(); |
|
| 612 |
if(folders.getCurrent() != null && folders.isOthersSharedItem(folders.getCurrent())){
|
|
| 613 |
DnDTreeItem otherUser = (DnDTreeItem) folders.getUserOfSharedItem(folders.getCurrent()); |
|
| 614 |
if(otherUser==null) |
|
| 615 |
shared = false; |
|
| 612 |
if(GSS.get().getTreeView().getSelection()!=null && (GSS.get().getTreeView().getSelection() instanceof OtherUserResource || GSS.get().getTreeView().getSelection() instanceof OthersFolderResource)){
|
|
| 613 |
OtherUserResource otherUser = null; |
|
| 614 |
if(GSS.get().getTreeView().getSelection() instanceof OtherUserResource) |
|
| 615 |
otherUser = (OtherUserResource) GSS.get().getTreeView().getSelection(); |
|
| 616 |
else if (GSS.get().getTreeView().getSelection() instanceof OthersFolderResource){
|
|
| 617 |
otherUser = GSS.get().getTreeView().getOtherUserResourceOfOtherFolder((OthersFolderResource) GSS.get().getTreeView().getSelection()); |
|
| 618 |
} |
|
| 619 |
if(otherUser ==null) |
|
| 620 |
shared=false; |
|
| 616 | 621 |
else{
|
| 617 |
String uname = otherUser.getOtherUserResource().getUsername();
|
|
| 622 |
String uname = otherUser.getUsername(); |
|
| 618 | 623 |
if(uname==null) |
| 619 |
uname = ((DnDTreeItem)folders.getSharesItem()).getOthersResource().getUsernameOfUri(otherUser.getOtherUserResource().getUri());
|
|
| 624 |
uname = GSS.get().getTreeView().getOthers().getUsernameOfUri(otherUser.getUri());
|
|
| 620 | 625 |
if(uname != null) |
| 621 | 626 |
shared = file.isShared(); |
| 622 | 627 |
} |
| 623 | 628 |
} |
| 624 |
else*/
|
|
| 629 |
else |
|
| 625 | 630 |
shared = file.isShared(); |
| 626 | 631 |
if (mimetype == null) |
| 627 | 632 |
return shared ? images.documentShared() : images.document(); |
| ... | ... | |
| 703 | 708 |
setFiles(((SharedResource) folderItem).getFiles()); |
| 704 | 709 |
update(true); |
| 705 | 710 |
} |
| 711 |
if (folderItem instanceof OtherUserResource) {
|
|
| 712 |
|
|
| 713 |
setFiles(((OtherUserResource) folderItem).getFiles()); |
|
| 714 |
GWT.log("----->"+files);
|
|
| 715 |
update(true); |
|
| 716 |
} |
|
| 706 | 717 |
if (folderItem instanceof TrashResource) {
|
| 707 | 718 |
setFiles(((TrashResource) folderItem).getFiles()); |
| 708 | 719 |
update(true); |
| 709 | 720 |
} |
| 721 |
GWT.log(folderItem.getClass().getName()); |
|
| 710 | 722 |
} |
| 711 | 723 |
|
| 712 | 724 |
/** |
| b/src/gr/ebs/gss/client/GSS.java | ||
|---|---|---|
| 570 | 570 |
TrashResource folder = (TrashResource) currentFolder; |
| 571 | 571 |
files = folder.getFiles(); |
| 572 | 572 |
} |
| 573 |
else if (currentFolder instanceof OtherUserResource) {
|
|
| 574 |
OtherUserResource folder = (OtherUserResource) currentFolder; |
|
| 575 |
files = folder.getFiles(); |
|
| 576 |
} |
|
| 573 | 577 |
if (files != null) |
| 574 | 578 |
getFileList().setFiles(files); |
| 575 | 579 |
} |
| ... | ... | |
| 885 | 889 |
} |
| 886 | 890 |
|
| 887 | 891 |
public void onResourceUpdate(RestResource resource){
|
| 888 |
if(resource instanceof RestResourceWrapper){
|
|
| 892 |
if(resource instanceof RestResourceWrapper || resource instanceof OtherUserResource){
|
|
| 889 | 893 |
if(getTreeView().getSelection()!=null&&getTreeView().getSelection().getUri().equals(resource.getUri())) |
| 890 | 894 |
showFileList(resource,true); |
| 891 | 895 |
} |
Also available in: Unified diff