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

Monotone-Parent: 75fcb06d679aeaa2164c930b62aab2d44c31ff16

Browse Source 
Monotone-Revision: 563fcb93a27e1179ab8c69db8761cb2ff3033025

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-13T22:30:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-08-13 22:30:55 +00:00
parent 326fce5029
commit 1fdede5a45
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2008-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/iCalEventChanges+SOGo.m
([iCalEventChanges -sequenceShouldBeIncreased]): added summary and
comment.
* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
-contactInfosForUserWithUIDorEmail:uid]): only use the
authentication sources.
SoObjects/Appointments/SOGoAppointmentObject.m
+9 -10
View File
@@ -337,11 +337,11 @@
{
iCalEvent *oldEvent;
NSArray *attendees;
SOGoUser *currentUser;
SOGoUser *ownerUser;
[[newEvent parent] setMethod: @""];
currentUser = [context activeUser];
if ([newEvent userIsOrganizer: currentUser])
ownerUser = [SOGoUser userWithLogin: owner roles: nil];
if ([newEvent userIsOrganizer: ownerUser])
{
oldEvent = [self component: NO secure: NO];
if (oldEvent)
@@ -358,9 +358,7 @@
toAttendees: attendees];
}
if (![[newEvent attendees] count]
&& [[self ownerInContext: context]
isEqualToString: [currentUser login]])
if (![[newEvent attendees] count])
[[newEvent uniqueChildWithTag: @"organizer"] setValue: 0
to: @""];
}
@@ -604,17 +602,18 @@
- (void) prepareDeleteOccurence: (iCalEvent *) occurence
{
iCalEvent *event;
SOGoUser *currentUser;
SOGoUser *ownerUser, *currentUser;
NSArray *attendees;
if ([[context request] handledByDefaultHandler])
{
currentUser = [context activeUser];
ownerUser = [SOGoUser userWithLogin: owner roles: nil];
event = [self component: NO secure: NO];
if (!occurence)
occurence = event;
if ([event userIsOrganizer: currentUser])
if ([event userIsOrganizer: ownerUser])
{
currentUser = [context activeUser];
attendees = [occurence attendeesWithoutUser: currentUser];
if (![attendees count] && event != occurence)
attendees = [event attendeesWithoutUser: currentUser];
@@ -627,7 +626,7 @@
toAttendees: attendees];
}
}
else if ([occurence userIsParticipant: currentUser])
else if ([occurence userIsParticipant: ownerUser])
[self changeParticipationStatus: @"DECLINED"];
}
}
SoObjects/Appointments/iCalEventChanges+SOGo.m
+2 -1
View File
@@ -33,7 +33,8 @@
NSString *properties[] = {@"organizer", @"startDate", @"endDate", /* vtask:
@"due" */
@"rdate", @"rrule", @"exdate", @"exrule",
@"status", @"location", nil};
@"status", @"summary", @"comment", @"location",
nil};
NSString **currentProperty;
BOOL updateRequired;
SoObjects/Appointments/product.plist
+1 -1
View File
@@ -39,7 +39,7 @@
"ViewAllComponent" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer" );
"ViewDAndT" = ( "Organizer", "Participant", "ComponentDAndTViewer" );
"ModifyComponent" = ( "Owner", "ComponentModifier" );
"RespondToComponent" = ( "Participant", "ComponentModifier", "ComponentResponder" );
"RespondToComponent" = ( "Owner", "ComponentModifier", "ComponentResponder" );
"Access Object" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer", "ComponentDAndTViewer" );
"Change Images and Files" = ( "Owner", "Organizer", "ComponentModifier" );
"Access Contents Information" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer", "ComponentDAndTViewer" );