projects
/
pithos-macos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'my shared' nodes can be copied.
[pithos-macos]
/
pithos-macos
/
PithosObjectNode.m
diff --git
a/pithos-macos/PithosObjectNode.m
b/pithos-macos/PithosObjectNode.m
index
e72b6f1
..
d396d4b
100644
(file)
--- a/
pithos-macos/PithosObjectNode.m
+++ b/
pithos-macos/PithosObjectNode.m
@@
-108,9
+108,9
@@
pithosObject = [aPithosObject retain];
}
self.isPublic = (pithosObject.publicURI != nil);
pithosObject = [aPithosObject retain];
}
self.isPublic = (pithosObject.publicURI != nil);
- // Refresh parent if the object is in my shared and is no longer shared
+ // Refresh browser if the object is in my shared and is no longer shared
if (shared && !pithosObject.sharing)
if (shared && !pithosObject.sharing)
- [self.parent refreshToRoot];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"PithosBrowserRefreshNeeeded" object:self];
}
#pragma mark -
}
#pragma mark -
@@
-121,14
+121,17
@@
NSLog(@"cached: %d", [request didUseCachedResponse]);
if ([request isEqualTo:applyMetadataObjectRequest]) {
NSLog(@"cached: %d", [request didUseCachedResponse]);
if ([request isEqualTo:applyMetadataObjectRequest]) {
+ int responseStatusCode = applyMetadataObjectRequest.responseStatusCode;
+ if (responseStatusCode != 202)
+ [PithosFileUtilities unexpectedResponseStatusAlertWithRequest:applyMetadataObjectRequest];
@synchronized(self) {
[applyMetadataObjectRequest release];
applyMetadataObjectRequest = nil;
}
@synchronized(self) {
[applyMetadataObjectRequest release];
applyMetadataObjectRequest = nil;
}
- [self refreshInfo];
+ if (responseStatusCode == 202)
+ [self refreshInfo];
} else if ([request isEqualTo:refreshMetadataObjectRequest]) {
[[pithosNodeInfoController window] makeFirstResponder:nil];
} else if ([request isEqualTo:refreshMetadataObjectRequest]) {
[[pithosNodeInfoController window] makeFirstResponder:nil];
-
self.pithosObject = [refreshMetadataObjectRequest object];
@synchronized(self) {
[refreshMetadataObjectRequest release];
self.pithosObject = [refreshMetadataObjectRequest object];
@synchronized(self) {
[refreshMetadataObjectRequest release];
@@
-165,7
+168,7
@@
contentEncoding:pithosObject.contentEncoding
contentDisposition:pithosObject.contentDisposition
manifest:pithosObject.manifest
contentEncoding:pithosObject.contentEncoding
contentDisposition:pithosObject.contentDisposition
manifest:pithosObject.manifest
- sharing:pithosObject.sharing
+ sharing:(pithosObject.sharing ? pithosObject.sharing : @"")
isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse)
metadata:pithosObject.metadata
update:NO] retain];
isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse)
metadata:pithosObject.metadata
update:NO] retain];