Revision c2b71ac3

b/web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java
172 172

  
173 173
            contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(GSS.get(), this, selectedFiles, images, 0)));
174 174

  
175
			contextMenu.addItem(new MenuItem("<span><a class='hidden-link' href='" + GSS.get().getApiPath() + GSS.get().getUsername() + selectedFiles.get(0).getUri() + "?X-Auth-Token=" + GSS.get().getToken() + "' target='_blank'>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</a></span>", true, (Command) null));
175
            if (!selectedFiles.isEmpty())
176
			    contextMenu.addItem(new MenuItem("<span><a class='hidden-link' href='" + GSS.get().getApiPath() + GSS.get().getUsername() + selectedFiles.get(0).getUri() + "?X-Auth-Token=" + GSS.get().getToken() + "' target='_blank'>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</a></span>", true, (Command) null));
176 177

  
177 178
			MenuItem unSelect = new MenuItem("<span>" + AbstractImagePrototype.create(images.unselectAll()).getHTML() + "&nbsp;Unselect</span>", true, new Command() {
178 179
                @Override
b/web_client/src/gr/grnet/pithos/web/client/FileList.java
447 447
        vp.addHandler(new ContextMenuHandler() {
448 448
            @Override
449 449
            public void onContextMenu(ContextMenuEvent event) {
450
                FileContextMenu contextMenu = new FileContextMenu(images, treeView.getSelection(), getSelectedFiles(), false);
451
                int x = event.getNativeEvent().getClientX();
452
                int y = event.getNativeEvent().getClientY();
453
                contextMenu.setPopupPosition(x, y);
454
                contextMenu.show();
450
                Folder selectedFolder = treeView.getSelection();
451
                if (!selectedFolder.isTrash()) {
452
                    FileContextMenu contextMenu = new FileContextMenu(images, selectedFolder, getSelectedFiles(), false);
453
                    int x = event.getNativeEvent().getClientX();
454
                    int y = event.getNativeEvent().getClientY();
455
                    contextMenu.setPopupPosition(x, y);
456
                    contextMenu.show();
457
                }
455 458
            }
456 459
        }, ContextMenuEvent.getType());
457 460
		initWidget(vp);
b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
75 75
        public void onBrowserEvent(Cell.Context context, com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater<Folder> valueUpdater) {
76 76
            if (event.getType().equals(ContextMenuEvent.getType().getName())) {
77 77
                FolderTreeViewModel.this.selectionModel.setSelected(folder, true);
78
                FolderContextMenu menu = new FolderContextMenu(FolderTreeView.images, folder);
79
                menu.setPopupPosition(event.getClientX(), event.getClientY());
80
                menu.show();
78
                if (!folder.isTrash()) {
79
                    FolderContextMenu menu = new FolderContextMenu(FolderTreeView.images, folder);
80
                    menu.setPopupPosition(event.getClientX(), event.getClientY());
81
                    menu.show();
82
                }
81 83
            }
82 84
        }
83 85
    };

Also available in: Unified diff