amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-10 10:55:08 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: db6101745dbd661ce3278ea7f4c6bb9837382a4f

Browse Source 
Monotone-Revision: 70ad94d55908966fdc416a1daead1a79c3ee8cd3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-30T21:21:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-06-30 21:21:50 +00:00
parent b91c48de4f
commit c619a07d57
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2009-06-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-davCalendarMultiget, -davCalendarQuery): certain dav attribute
methods do not necessitate additional fields, we declare their
corresponding fields to "". Also, we make sure those fake fields
are not specified in the SQL query and we ensure all the fields
are only requested once each.
2009-06-30 Cyril Robert <crobert@inverse.ca>
* UI/WebServerResources/MailerUI.js: Added drag & drop support!
SoObjects/Appointments/SOGoAppointmentFolder.m
+12 -4
View File
@@ -1579,13 +1579,17 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
NSMutableArray *fields;
NSDictionary *currentFilter;
NSEnumerator *filterList;
NSString *additionalFilters, *baseURL;
NSString *additionalFilters, *baseURL, *currentField;
NSMutableString *buffer;
NSString **propertiesArray;
NSEnumerator *addFields;
unsigned int count, max, propertiesCount;
fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_component", nil];
[fields addObjectsFromArray: [properties allValues]];
addFields = [[properties allValues] objectEnumerator];
while ((currentField = [addFields nextObject]))
if ([currentField length])
[fields addObjectUniquely: currentField];
baseURL = [[self davURL] absoluteString];
propertiesArray = [[properties allKeys] asPointersOfObjects];
@@ -1798,11 +1802,12 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
NSObject <DOMElement> *element;
NSDictionary *currentComponent, *components;
NSString *currentURL, *baseURL;
NSString *currentURL, *baseURL, *currentField;
NSString **propertiesArray;
NSMutableArray *urls, *fields;
NSMutableString *buffer;
unsigned int count, max, propertiesCount;
NSEnumerator *addFields;
baseURL = [[self davURL] absoluteString];
@@ -1819,7 +1824,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
propertiesCount = [properties count];
fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_component", nil];
[fields addObjectsFromArray: [properties allValues]];
addFields = [[properties allValues] objectEnumerator];
while ((currentField = [addFields nextObject]))
if ([currentField length])
[fields addObjectUniquely: currentField];
components = [self _fetchComponentsMatchingURLs: urls fields: fields];
max = [urls count];