LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix time conflict validation

pull/245/head
Francis Lachapelle 2018-10-22 11:20:06 -04:00
parent 98bbe2ddfa
commit 59c3bdc242
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -660,7 +660,7 @@
}
fb = [SOGoFreeBusyObject objectWithName: @"freebusy.ifb" inContainer: [user homeFolderInContext: context]];
fbInfo = [fb fetchFreeBusyInfosFrom: start to: end];
fbInfo = (NSMutableArray *)[fb fetchFreeBusyInfosFrom: start to: end];
//
// We must also check here for repetitive events that don't overlap our event.
@ -804,7 +804,7 @@
if ([[o objectForKey: @"startDate"] isDateOnSameDay: end])
formattedEnd = [formatter formattedTime: end];
else
[formatter formattedDateAndTime: end];
formattedEnd = [formatter formattedDateAndTime: end];
[conflicts addObject: [NSDictionary dictionaryWithObjectsAndKeys: [formatter formattedDateAndTime: [o objectForKey: @"startDate"]], @"startDate",
formattedEnd, @"endDate", nil]];