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

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

pull/186/head
Ludovic Marcotte 2015-12-15 15:05:40 -05:00
parent 0f578876af
commit 76f0ec9ae0
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -2189,13 +2189,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];
}

4
SoObjects/Appointments/iCalEntityObject+SOGo.h
View File

@ -44,8 +44,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;

8
SoObjects/Appointments/iCalEntityObject+SOGo.m
View File

@ -436,8 +436,8 @@ NSNumber *iCalDistantFutureNumber = nil;
return userAttendee;
}
- (NSString *) participationStatusForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee
- (iCalPerson *) participantForUser: (SOGoUser *) theUser
attendee: (iCalPerson *) theAttendee
{
iCalPerson *currentAttendee;
NSEnumerator *attendees;
@ -459,9 +459,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