amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-19 02:15:36 +00:00
Code Issues Projects Releases Wiki Activity

(fix) carry over the delegatedTo, not only the part stat

Browse Source
This commit is contained in:
Ludovic Marcotte
2015-12-15 15:05:40 -05:00
parent c6dbcb2f7c
commit 28bd4ca318
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+5 -4
View File
@@ -2187,13 +2187,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
// of its identity (which is different than the email address associated with
// the mail account) prior doing a calendar refresh.
NSMutableArray *attendees;
NSString *partStat;
iCalPerson *participant;
attendees = [NSMutableArray arrayWithArray: [newEvent attendeesWithoutUser: [SOGoUser userWithLogin: owner]]];
partStat = [newEvent participationStatusForUser: [SOGoUser userWithLogin: owner]
attendee: attendee];
[attendee setPartStat: partStat];
participant = [newEvent participantForUser: [SOGoUser userWithLogin: owner]
attendee: attendee];
[attendee setPartStat: [participant partStat]];
[attendee setDelegatedTo: [participant delegatedTo]];
[attendees addObject: attendee];
[newEvent setAttendees: attendees];
}
SoObjects/Appointments/iCalEntityObject+SOGo.h
+2 -2
View File
@@ -39,8 +39,8 @@ extern NSNumber *iCalDistantFutureNumber;
- (iCalPerson *) userAsAttendee: (SOGoUser *) user;
- (NSString *) participationStatusForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee;
- (iCalPerson *) participantForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee;
- (NSArray *) attendeeUIDs;
- (BOOL) isStillRelevant;
SoObjects/Appointments/iCalEntityObject+SOGo.m
+4 -4
View File
@@ -99,8 +99,8 @@ NSNumber *iCalDistantFutureNumber = nil;
return userAttendee;
}
- (NSString *) participationStatusForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee
- (iCalPerson *) participantForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee
{
iCalPerson *currentAttendee;
NSEnumerator *attendees;
@@ -122,9 +122,9 @@ NSNumber *iCalDistantFutureNumber = nil;
}
if ([a count] > 0)
return [[a objectAtIndex: 0] partStat];
return [a objectAtIndex: 0];
return [theAttendee partStat];
return theAttendee;
}
- (BOOL) userIsOrganizer: (SOGoUser *) user