amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-27 00:52:45 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2
Monotone-Revision: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-18T19:05:58
This commit is contained in:
Ludovic Marcotte
2012-07-18 19:05:58 +00:00
parent c88d86ec95
commit 1abc40c127
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2012-07-18 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentObject.m
(_setupResponseInRequestCalendar:): we now return the
calendar read from the database and not use the one
from the request anymore, as it can override properties
other than participation status changes.
2012-07-18 Jean Raby <jraby@inverse.ca>
* Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh
* Scripts/sql-update-1.3.16_to_1.3.17.sh:

6
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@@ -1534,7 +1534,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
return partStats;
}
- (void) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar
- (iCalCalendar *) _setupResponseInRequestCalendar: (iCalCalendar *) rqCalendar
{
iCalCalendar *calendar;
NSArray *keys;
@@ -1559,6 +1559,8 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
}
}
}
return calendar;
}
- (void) _adjustTransparencyInRequestCalendar: (iCalCalendar *) rqCalendar
@@ -1718,7 +1720,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
//
if ([roles containsObject: @"ComponentResponder"]
&& ![roles containsObject: @"ComponentModifier"])
[self _setupResponseInRequestCalendar: calendar];
calendar = [self _setupResponseInRequestCalendar: calendar];
else
{
if (![[rq headersForKey: @"X-SOGo"]