Monotone-Parent: 5f0e6bd5b6298ffdd908398135216841ba3b6909
Monotone-Revision: 22b4654cd70bbe3488846e0939147e93e6113c95 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-23T23:38:52 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
f9337f183f
commit
39c9be64db
|
@ -1,3 +1,10 @@
|
||||||
|
2009-06-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/Appointments/SOGoAppointmentFolder.m
|
||||||
|
(-davCalendarQuery:,-davCalendarMultiget:): automatically include
|
||||||
|
"c_component" in the requested fields, so that items can be
|
||||||
|
instantiated properly.
|
||||||
|
|
||||||
2009-06-23 Cyril Robert <crobert@inverse.ca>
|
2009-06-23 Cyril Robert <crobert@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/Mailer/NSString+Mail.m (stringByConvertingCRLNToHTML): Added
|
* SoObjects/Mailer/NSString+Mail.m (stringByConvertingCRLNToHTML): Added
|
||||||
|
|
|
@ -79,8 +79,6 @@
|
||||||
|
|
||||||
static NGLogger *logger = nil;
|
static NGLogger *logger = nil;
|
||||||
static NSNumber *sharedYes = nil;
|
static NSNumber *sharedYes = nil;
|
||||||
static NSArray *reportQueryFields = nil;
|
|
||||||
static NSArray *reducedReportQueryFields = nil;
|
|
||||||
|
|
||||||
+ (void) initialize
|
+ (void) initialize
|
||||||
{
|
{
|
||||||
|
@ -93,21 +91,6 @@ static NSArray *reducedReportQueryFields = nil;
|
||||||
|
|
||||||
[iCalEntityObject initializeSOGoExtensions];
|
[iCalEntityObject initializeSOGoExtensions];
|
||||||
|
|
||||||
if (!reportQueryFields)
|
|
||||||
reportQueryFields = [[NSArray alloc] initWithObjects: @"c_name",
|
|
||||||
@"c_content", @"c_creationdate",
|
|
||||||
@"c_lastmodified", @"c_version",
|
|
||||||
@"c_component",
|
|
||||||
@"c_classification",
|
|
||||||
nil];
|
|
||||||
if (!reducedReportQueryFields)
|
|
||||||
reducedReportQueryFields = [[NSArray alloc] initWithObjects:
|
|
||||||
@"c_name",
|
|
||||||
@"c_creationdate",
|
|
||||||
@"c_lastmodified",
|
|
||||||
@"c_version",
|
|
||||||
@"c_classification",
|
|
||||||
@"c_component", nil];
|
|
||||||
NSAssert2([super version] == 0,
|
NSAssert2([super version] == 0,
|
||||||
@"invalid superclass (%@) version %i !",
|
@"invalid superclass (%@) version %i !",
|
||||||
NSStringFromClass([self superclass]), [super version]);
|
NSStringFromClass([self superclass]), [super version]);
|
||||||
|
@ -1601,7 +1584,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
||||||
NSString **propertiesArray;
|
NSString **propertiesArray;
|
||||||
unsigned int count, max, propertiesCount;
|
unsigned int count, max, propertiesCount;
|
||||||
|
|
||||||
fields = [NSMutableArray arrayWithObject: @"c_name"];
|
fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_component", nil];
|
||||||
[fields addObjectsFromArray: [properties allValues]];
|
[fields addObjectsFromArray: [properties allValues]];
|
||||||
baseURL = [[self davURL] absoluteString];
|
baseURL = [[self davURL] absoluteString];
|
||||||
|
|
||||||
|
@ -1835,7 +1818,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
||||||
propertiesArray = [[properties allKeys] asPointersOfObjects];
|
propertiesArray = [[properties allKeys] asPointersOfObjects];
|
||||||
propertiesCount = [properties count];
|
propertiesCount = [properties count];
|
||||||
|
|
||||||
fields = [NSMutableArray arrayWithObject: @"c_name"];
|
fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_component", nil];
|
||||||
[fields addObjectsFromArray: [properties allValues]];
|
[fields addObjectsFromArray: [properties allValues]];
|
||||||
|
|
||||||
components = [self _fetchComponentsMatchingURLs: urls fields: fields];
|
components = [self _fetchComponentsMatchingURLs: urls fields: fields];
|
||||||
|
@ -2295,7 +2278,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
||||||
count = [records count];
|
count = [records count];
|
||||||
if (count)
|
if (count)
|
||||||
{
|
{
|
||||||
filename = [[records objectAtIndex:0] valueForKey:@"c_name"];
|
filename = [[records objectAtIndex:0] valueForKey: @"c_name"];
|
||||||
if (count > 1)
|
if (count > 1)
|
||||||
[self errorWithFormat:
|
[self errorWithFormat:
|
||||||
@"The storage contains more than file with UID '%@'",
|
@"The storage contains more than file with UID '%@'",
|
||||||
|
|
Loading…
Reference in New Issue