Revision cde22209 src/gr/grnet/pithos/web/client/Pithos.java
b/src/gr/grnet/pithos/web/client/Pithos.java | ||
---|---|---|
126 | 126 |
return userID; |
127 | 127 |
} |
128 | 128 |
|
129 |
public String getUserDisplayName() {
|
|
129 |
public String getCurrentUserDisplayNameOrID() {
|
|
130 | 130 |
final String displayName = userCatalogs.getDisplayName(getUserID()); |
131 | 131 |
return displayName == null ? getUserID() : displayName; |
132 | 132 |
} |
133 | 133 |
|
134 |
public boolean hasUserDisplayNameForID(String id) { |
|
135 |
return userCatalogs.getDisplayName(id) != null; |
|
136 |
} |
|
137 |
|
|
138 |
public String getUserDisplayNameByID(String id) { |
|
139 |
return userCatalogs.getDisplayName(id); |
|
140 |
} |
|
141 |
|
|
134 | 142 |
public void setAccount(AccountResource acct) { |
135 | 143 |
account = acct; |
136 | 144 |
} |
... | ... | |
1025 | 1033 |
}; |
1026 | 1034 |
copyFile.setHeader("X-Auth-Token", getUserToken()); |
1027 | 1035 |
copyFile.setHeader("X-Copy-From", URL.encodePathSegment(file.getUri())); |
1028 |
if(!file.getOwner().equals(targetUsername)) { |
|
1029 |
copyFile.setHeader("X-Source-Account", URL.encodePathSegment(file.getOwner())); |
|
1036 |
if(!file.getOwnerID().equals(targetUsername)) {
|
|
1037 |
copyFile.setHeader("X-Source-Account", URL.encodePathSegment(file.getOwnerID()));
|
|
1030 | 1038 |
} |
1031 | 1039 |
copyFile.setHeader("Content-Type", file.getContentType()); |
1032 | 1040 |
Scheduler.get().scheduleDeferred(copyFile); |
... | ... | |
1321 | 1329 |
} |
1322 | 1330 |
|
1323 | 1331 |
public void scheduleFileHeadCommand(File f, final Command callback) { |
1324 |
HeadRequest<File> headFile = new HeadRequest<File>(File.class, getApiPath(), f.getOwner(), f.getUri(), f) { |
|
1332 |
HeadRequest<File> headFile = new HeadRequest<File>(File.class, getApiPath(), f.getOwnerID(), f.getUri(), f) {
|
|
1325 | 1333 |
|
1326 | 1334 |
@Override |
1327 | 1335 |
public void onSuccess(File _result) { |
Also available in: Unified diff