Revision 4eaecbac src/gr/grnet/pithos/web/client/Pithos.java
| b/src/gr/grnet/pithos/web/client/Pithos.java | ||
|---|---|---|
| 505 | 505 |
return true; |
| 506 | 506 |
} |
| 507 | 507 |
|
| 508 |
HeadRequest<Folder> head = new HeadRequest<Folder>(Folder.class, getApiPath(), f.getOwner(), "/" + f.getContainer()) {
|
|
| 508 |
HeadRequest<Folder> head = new HeadRequest<Folder>(Folder.class, getApiPath(), f.getOwnerID(), "/" + f.getContainer()) {
|
|
| 509 | 509 |
|
| 510 | 510 |
@Override |
| 511 | 511 |
public void onSuccess(Folder _result) {
|
| ... | ... | |
| 583 | 583 |
} |
| 584 | 584 |
else {
|
| 585 | 585 |
Boolean[] perms = f.getPermissions().get(userID); |
| 586 |
if(f.getOwner().equals(userID) || (perms != null && perms[1] != null && perms[1])) {
|
|
| 586 |
if(f.getOwnerID().equals(userID) || (perms != null && perms[1] != null && perms[1])) {
|
|
| 587 | 587 |
upload.setEnabled(true); |
| 588 | 588 |
enableUploadArea(); |
| 589 | 589 |
} |
| ... | ... | |
| 954 | 954 |
final PleaseWaitPopup pwp = new PleaseWaitPopup(); |
| 955 | 955 |
pwp.center(); |
| 956 | 956 |
String path = "/" + folder.getContainer() + "/" + folder.getPrefix() + "?delimiter=/" + "&t=" + System.currentTimeMillis(); |
| 957 |
DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), folder.getOwner(), path) {
|
|
| 957 |
DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), folder.getOwnerID(), path) {
|
|
| 958 | 958 |
|
| 959 | 959 |
@Override |
| 960 | 960 |
protected void onUnauthorized(Response response) {
|
| ... | ... | |
| 1075 | 1075 |
copyFolder.setHeader("Accept", "*/*");
|
| 1076 | 1076 |
copyFolder.setHeader("Content-Length", "0");
|
| 1077 | 1077 |
copyFolder.setHeader("Content-Type", "application/directory");
|
| 1078 |
if(!f.getOwner().equals(targetUsername)) {
|
|
| 1079 |
copyFolder.setHeader("X-Source-Account", f.getOwner());
|
|
| 1078 |
if(!f.getOwnerID().equals(targetUsername)) {
|
|
| 1079 |
copyFolder.setHeader("X-Source-Account", f.getOwnerID());
|
|
| 1080 | 1080 |
} |
| 1081 | 1081 |
if(move) {
|
| 1082 | 1082 |
copyFolder.setHeader("X-Move-From", URL.encodePathSegment(f.getUri()));
|
| ... | ... | |
| 1260 | 1260 |
} |
| 1261 | 1261 |
} |
| 1262 | 1262 |
else {
|
| 1263 |
HeadRequest<Folder> headFolder = new HeadRequest<Folder>(Folder.class, getApiPath(), folder.getOwner(), folder.getUri(), folder) {
|
|
| 1263 |
HeadRequest<Folder> headFolder = new HeadRequest<Folder>(Folder.class, getApiPath(), folder.getOwnerID(), folder.getUri(), folder) {
|
|
| 1264 | 1264 |
|
| 1265 | 1265 |
@Override |
| 1266 | 1266 |
public void onSuccess(Folder _result) {
|
| ... | ... | |
| 1274 | 1274 |
if(t instanceof RestException) {
|
| 1275 | 1275 |
if(((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND) {
|
| 1276 | 1276 |
final String path = folder.getUri(); |
| 1277 |
PutRequest newFolder = new PutRequest(getApiPath(), folder.getOwner(), path) {
|
|
| 1277 |
PutRequest newFolder = new PutRequest(getApiPath(), folder.getOwnerID(), path) {
|
|
| 1278 | 1278 |
@Override |
| 1279 | 1279 |
public void onSuccess(Resource _result) {
|
| 1280 | 1280 |
scheduleFolderHeadCommand(folder, callback); |
Also available in: Unified diff