Monotone-Parent: 2fc6280bdb3c83d905fa7c92b0b16e52d95d4694
Monotone-Revision: 2cc61994b1fd18611f88fb4a7bd881ef6c12c05c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-14T16:47:10 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
02e2cdf7af
commit
eb7acf4be7
|
@ -1,5 +1,9 @@
|
|||
2008-07-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
|
||||
-setIsNew:newIsNew]): new setter that declares the record as new,
|
||||
since it is no longer so by default.
|
||||
|
||||
* SoObjects/Appointments/SOGoAppointmentFolder.m ([SOGoAppointmentFolder -davCalendarOrder])
|
||||
([SOGoAppointmentFolder -setDavCalendarOrder:newColor]): new
|
||||
accessors to handle Apple's "calendar-order" property.
|
||||
|
|
|
@ -154,8 +154,11 @@
|
|||
}
|
||||
|
||||
if (!object)
|
||||
object = [SOGoAppointmentObject objectWithName: nameInContainer
|
||||
inContainer: folder];
|
||||
{
|
||||
object = [SOGoAppointmentObject objectWithName: nameInContainer
|
||||
inContainer: folder];
|
||||
[object setIsNew: YES];
|
||||
}
|
||||
|
||||
return object;
|
||||
}
|
||||
|
|
|
@ -53,6 +53,8 @@
|
|||
/* content */
|
||||
|
||||
- (BOOL) isNew;
|
||||
- (void) setIsNew: (BOOL) newIsNew;
|
||||
|
||||
- (NSString *) contentAsString;
|
||||
- (NSException *) saveContentString: (NSString *) _str
|
||||
baseVersion: (unsigned int) _baseVersion;
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
{
|
||||
if ((self = [super init]))
|
||||
{
|
||||
isNew = YES;
|
||||
isNew = NO;
|
||||
content = nil;
|
||||
version = 0;
|
||||
lastModified = nil;
|
||||
|
@ -91,7 +91,6 @@
|
|||
newContent = [objectRecord objectForKey: @"c_content"];
|
||||
if (newContent)
|
||||
{
|
||||
isNew = NO;
|
||||
ASSIGN (content, newContent);
|
||||
version = [[objectRecord objectForKey: @"c_version"] unsignedIntValue];
|
||||
intValue = [[objectRecord objectForKey: @"c_creationdate"] intValue];
|
||||
|
@ -151,6 +150,11 @@
|
|||
return isNew;
|
||||
}
|
||||
|
||||
- (void) setIsNew: (BOOL) newIsNew
|
||||
{
|
||||
isNew = newIsNew;
|
||||
}
|
||||
|
||||
- (NSString *) contentAsString
|
||||
{
|
||||
return content;
|
||||
|
|
|
@ -573,8 +573,11 @@ static NSArray *childRecordFields = nil;
|
|||
{
|
||||
request = [localContext request];
|
||||
if ([[request method] isEqualToString: @"PUT"])
|
||||
obj = [self _createChildComponentWithName: key
|
||||
andContent:[request contentAsString]];
|
||||
{
|
||||
obj = [self _createChildComponentWithName: key
|
||||
andContent: [request contentAsString]];
|
||||
[obj setIsNew: YES];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue