Monotone-Parent: d437e557ba061f106fd0db804a748fcc43343cad

Monotone-Revision: 2a7c60a2ee3b528beed93ea6fa36231b661edfae

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-26T16:35:30
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2006-10-26 16:35:30 +00:00
parent e17de2e4b9
commit c1e77f441d
2 changed files with 12 additions and 3 deletions

View File

@ -1,5 +1,10 @@
2006-10-26 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage
-_freeBusyAsText]): added handling of an "additional"-named query
parameter that describe the number of additional days after
enddate that should be returned.
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
-_responseForResults:results]): give priority to results with
"c_uid" fields. If none returned, use the first contact received.

View File

@ -301,7 +301,7 @@ static NSArray *internetAccessStates = nil;
{
SOGoFreeBusyObject *co;
NSCalendarDate *startDate, *endDate;
NSString *queryDay;
NSString *queryDay, *additionalDays;
NSTimeZone *uTZ;
co = [self clientObject];
@ -326,8 +326,12 @@ static NSArray *internetAccessStates = nil;
inTimeZone: uTZ];
else
endDate = [startDate hour: 23 minute: 59];
endDate = [endDate dateByAddingYears: 0 months: 0 days: 2
hours: 0 minutes: 0 seconds: 0];
additionalDays = [self queryParameterForKey: @"additional"];
if ([additionalDays length] > 0)
endDate = [endDate dateByAddingYears: 0 months: 0
days: [additionalDays intValue]
hours: 0 minutes: 0 seconds: 0];
return [self _freeBusyAsTextFromStartDate: startDate toEndDate: endDate
forFreeBusy: co];