Revision ea517aad src/gr/ebs/gss/client/FileMenu.java

b/src/gr/ebs/gss/client/FileMenu.java
25 25
import gr.ebs.gss.client.commands.UploadFileCommand;
26 26
import gr.ebs.gss.client.rest.RestCommand;
27 27
import gr.ebs.gss.client.rest.resource.FileResource;
28
import gr.ebs.gss.client.rest.resource.FolderResource;
28 29
import gr.ebs.gss.client.rest.resource.GroupUserResource;
29 30

  
30 31
import com.google.gwt.http.client.URL;
......
144 145
		Folders folders = GSS.get().getFolders();
145 146
		TreeItem selectedItem = folders.getCurrent();
146 147
		boolean downloadVisible = GSS.get().getCurrentSelection() != null && GSS.get().getCurrentSelection() instanceof FileResource;
148
		boolean uploadVisible = GSS.get().getFolders().getCurrent().getUserObject() instanceof FolderResource;
147 149
		boolean propertiesNotVisible = selectedItem != null && (folders.isTrash(selectedItem) || folders.isMyShares(selectedItem) || folders.isOthersShared(selectedItem) || selectedItem.getUserObject() instanceof GroupUserResource);
148 150
		contextMenu.addItem("<span>" + images.folderNew().getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(this, images));
149
		contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
151
		if (uploadVisible) contextMenu.addItem("<span>" + images.fileUpdate().getHTML() + "&nbsp;Upload</span>", true, new UploadFileCommand(this, images));
150 152
		if (downloadVisible) {
151 153
			String[] link = {"", ""};
152 154
			createDownloadLink(link);

Also available in: Unified diff