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

merge of '0187913e6e236a3a8a3a4cf66bf61a25d3cde321' 

and '9b0d550ad7ecf3304e02f47b720a4aed7b1b3ce0'

Monotone-Parent: 0187913e6e236a3a8a3a4cf66bf61a25d3cde321
Monotone-Parent: 9b0d550ad7ecf3304e02f47b720a4aed7b1b3ce0
Monotone-Revision: bc6abe537500d635cea12c3c4f611e68d4c2d725

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-19T02:41:46
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2008-12-19 02:41:46 +00:00
parent a0b81f4473 60c96ee105
commit 64eb68a085
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -699,7 +699,6 @@
BOOL isUpdate, hasChanged;
elements = [NSMutableArray array];
ownerUID = [[LDAPUserManager sharedUserManager]
getUIDForEmail: originator];
emailEvent = [self component: NO secure: NO];
@ -721,26 +720,29 @@
{
// We check if we must send an invitation update
// rather than just a normal invitation.
NSCalendarDate *recurrenceId;
NSString *iCalString;
SOGoAppointmentObject *oldEventObject;
SOGoAppointmentObject *oldEventObject, *ownerEventObject;
iCalCalendar *calendar;
oldEventObject = [self _lookupEvent: [newEvent uid] forUID: uid];
calendar = [oldEventObject calendar: NO secure: NO];
ownerEventObject = nil;
recurrenceId = [newEvent recurrenceId];
if (![oldEventObject isNew])
{
// We are updating an existing event.
// If the event containts a recurrence-id, replace the proper
// occurrence of the recurrent event.
iCalCalendar *calendar;
iCalEvent *currentOccurence;
iCalEventChanges *changes;
NSArray *occurences;
NSCalendarDate *recurrenceId, *currentId;
NSCalendarDate *currentId;
NSString *recurrenceTime;
unsigned int i;
calendar = [oldEventObject calendar: NO secure: NO];
recurrenceId = [newEvent recurrenceId];
if (recurrenceId == nil)
oldEvent = [oldEventObject component: NO secure: NO];
else
@ -776,11 +778,21 @@
// if necessary and with the proper template.
changes = [newEvent getChangesRelativeToEvent: oldEvent];
if ([[oldEvent sequence] compare: [newEvent sequence]] != NSOrderedSame
&& [changes sequenceShouldBeIncreased])
&& [changes sequenceShouldBeIncreased])
isUpdate = YES;
else
hasChanged = NO;
}
else if (recurrenceId)
{
// We must add a recurrence to a non-existing event -- simply retrieve
// the event from the organizer's calendar
if (ownerEventObject == nil)
ownerEventObject = [self _lookupEvent: [newEvent uid] forUID: ownerUID];
newEvent = [ownerEventObject component: NO secure: NO];
}
// We generate the updated iCalendar file and we save it
// in the database.

3
UI/WebServerResources/UIxAclEditor.css
View File

@ -60,6 +60,9 @@ UL#userList
list-style-type: none;
list-style-image: none; }
UL#userList LI
{ margin-left: 3px; }
UL#userList > LI._selected
{ background: #4b6983 !important;
color: #fff !important; }