Revision 4c69b354 src/gr/grnet/pithos/web/client/FileContextMenu.java
b/src/gr/grnet/pithos/web/client/FileContextMenu.java | ||
---|---|---|
199 | 199 |
} |
200 | 200 |
else { |
201 | 201 |
for (FileFolderResource res : selectedFiles) { |
202 |
if (res instanceof File) { |
|
203 |
File f = (File) res; |
|
204 |
permissions = f.getPermissions().get(app.getUsername()); |
|
205 |
canWrite &= (f.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1])); |
|
206 |
} |
|
202 |
permissions = res.getPermissions().get(app.getUsername()); |
|
203 |
canWrite &= (res.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1])); |
|
207 | 204 |
} |
208 | 205 |
} |
209 | 206 |
boolean isFolderTreeSelected = selectedTree.equals(app.getFolderTreeView()); |
210 | 207 |
boolean isMysharedSelected = selectedTree.equals(app.getMySharedTreeView()); |
208 |
// boolean folderFile = selectedFiles.get(0) instanceof Folder; |
|
211 | 209 |
if (selectedFolder != null) { |
212 | 210 |
if (!selectedFolder.isInTrash()) { |
213 | 211 |
if (canWrite && app.getClipboard().hasFiles() && !isMysharedSelected) { |
... | ... | |
219 | 217 |
MenuItem upload = new MenuItem("<span>" + AbstractImagePrototype.create(images.fileUpdate()).getHTML() + " Upload</span>", true, new UploadFileCommand(app, this, selectedFolder)); |
220 | 218 |
contextMenu.addItem(upload); |
221 | 219 |
} |
222 |
if (isFolderTreeSelected || isMysharedSelected) {
|
|
220 |
if ((isFolderTreeSelected || isMysharedSelected)) {
|
|
223 | 221 |
cutItem = new MenuItem("<span id='fileContextMenu.cut'>" + AbstractImagePrototype.create(newImages.cut()).getHTML() + " Cut</span>", true, new CutCommand(app, this, selectedFiles)); |
224 | 222 |
contextMenu.addItem(cutItem); |
225 | 223 |
} |
226 | 224 |
|
227 |
copyItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy</span>", true, new CopyCommand(app, this, selectedFiles)); |
|
228 |
contextMenu.addItem(copyItem); |
|
225 |
// if (!folderFile) { |
|
226 |
copyItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.copy()).getHTML() + " Copy</span>", true, new CopyCommand(app, this, selectedFiles)); |
|
227 |
contextMenu.addItem(copyItem); |
|
228 |
// } |
|
229 | 229 |
|
230 |
if (isFolderTreeSelected || isMysharedSelected) {
|
|
230 |
if ((isFolderTreeSelected || isMysharedSelected)) {
|
|
231 | 231 |
trashItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.emptyTrash()).getHTML() + " Move to Trash</span>", true, new ToTrashCommand(app, this, selectedFiles)); |
232 | 232 |
contextMenu.addItem(trashItem); |
233 | 233 |
} |
234 | 234 |
} |
235 | 235 |
else { |
236 |
MenuItem restore = new MenuItem("<span>" + AbstractImagePrototype.create(images.versions()).getHTML() + " Restore</span>", true, new RestoreTrashCommand(app, this, selectedFiles)); |
|
237 |
contextMenu.addItem(restore); |
|
236 |
// if (!folderFile) { |
|
237 |
MenuItem restore = new MenuItem("<span>" + AbstractImagePrototype.create(images.versions()).getHTML() + " Restore</span>", true, new RestoreTrashCommand(app, this, selectedFiles)); |
|
238 |
contextMenu.addItem(restore); |
|
239 |
// } |
|
238 | 240 |
} |
239 | 241 |
} |
240 | 242 |
|
241 |
if (isFolderTreeSelected || isMysharedSelected) {
|
|
243 |
if ((isFolderTreeSelected || isMysharedSelected)) {
|
|
242 | 244 |
deleteItem = new MenuItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + " Delete</span>", true, new DeleteCommand(app, this, selectedFiles, MessagePanel.images)); |
243 | 245 |
contextMenu.addItem(deleteItem); |
244 | 246 |
} |
... | ... | |
252 | 254 |
} |
253 | 255 |
|
254 | 256 |
} |
255 |
contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</span>", true, new Command() { |
|
256 |
|
|
257 |
@Override |
|
258 |
public void execute() { |
|
259 |
for (FileFolderResource res : selectedFiles) |
|
260 |
if (res instanceof File) { |
|
261 |
File f = (File) res; |
|
262 |
Window.open(app.getApiPath() + f.getOwner() + f.getUri(), "_blank", ""); |
|
263 |
} |
|
264 |
} |
|
265 |
})); |
|
257 |
// if (!folderFile) { |
|
258 |
contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</span>", true, new Command() { |
|
259 |
|
|
260 |
@Override |
|
261 |
public void execute() { |
|
262 |
for (FileFolderResource res : selectedFiles) |
|
263 |
if (res instanceof File) { |
|
264 |
File f = (File) res; |
|
265 |
Window.open(app.getApiPath() + f.getOwner() + f.getUri(), "_blank", ""); |
|
266 |
} |
|
267 |
} |
|
268 |
})); |
|
269 |
// } |
|
266 | 270 |
|
267 | 271 |
add(contextMenu); |
268 | 272 |
} |
Also available in: Unified diff