Revision cc0120ab src/gr/grnet/pithos/web/client/Toolbar.java
b/src/gr/grnet/pithos/web/client/Toolbar.java | ||
---|---|---|
78 | 78 |
public void onClick(ClickEvent event) { |
79 | 79 |
Folder folder = app.getSelectedTree().getSelection(); |
80 | 80 |
if (folder != null) { |
81 |
Boolean[] permissions = folder.getPermissions().get(app.getUsername());
|
|
82 |
boolean canWrite = folder.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
81 |
Boolean[] permissions = folder.getPermissions().get(app.getUserID());
|
|
82 |
boolean canWrite = folder.getOwner().equals(app.getUserID()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
83 | 83 |
|
84 | 84 |
if (!folder.isInTrash() && canWrite) |
85 | 85 |
new NewFolderCommand(app, null, folder).execute(); |
... | ... | |
98 | 98 |
public void onClick(ClickEvent event) { |
99 | 99 |
Folder folder = app.getSelectedTree().getSelection(); |
100 | 100 |
if (folder != null) { |
101 |
Boolean[] permissions = folder.getPermissions().get(app.getUsername());
|
|
102 |
boolean canWrite = folder.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
101 |
Boolean[] permissions = folder.getPermissions().get(app.getUserID());
|
|
102 |
boolean canWrite = folder.getOwner().equals(app.getUserID()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
103 | 103 |
boolean isFolderTreeSelected = app.getSelectedTree().equals(app.getFolderTreeView()); |
104 | 104 |
|
105 | 105 |
if (!folder.isInTrash() && canWrite && isFolderTreeSelected && !folder.isContainer()) |
... | ... | |
167 | 167 |
|
168 | 168 |
@Override |
169 | 169 |
public void execute() { |
170 |
Boolean[] permissions = folder.getPermissions().get(app.getUsername());
|
|
171 |
boolean canWrite = folder.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
170 |
Boolean[] permissions = folder.getPermissions().get(app.getUserID());
|
|
171 |
boolean canWrite = folder.getOwner().equals(app.getUserID()) || (permissions!= null && permissions[1] != null && permissions[1]);
|
|
172 | 172 |
boolean isFolderTreeSelected = app.getSelectedTree().equals(app.getFolderTreeView()); |
173 | 173 |
boolean otherSharedTreeSelected = app.getSelectedTree().equals(app.getOtherSharedTreeView()); |
174 | 174 |
|
Also available in: Unified diff