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

See ChangeLog

Browse Source 
Monotone-Parent: 04ba7fac2627906e1d9fb91e79b12769e1957a41
Monotone-Revision: 00ac31b5372de5deb01c919e39d6eacc4a512125

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-08-11T02:06:27
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-08-11 02:06:27 +00:00
parent 6a5af3ba35
commit ed79ed79fd
3 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
UI/Scheduler/UIxComponentEditor.m
View File

@@ -1535,25 +1535,23 @@ RANGE(2);
{
NSString *organizerEmail;
NSString *owner, *login;
BOOL isOwner, hasOrganizer, hasAttendees;
BOOL isOwner;
//owner = [[self clientObject] ownerInContext: context];
owner = [componentCalendar ownerInContext: context];
login = [[context activeUser] login];
isOwner = [owner isEqualToString: login];
hasAttendees = [self hasAttendees];
organizerEmail = [[component organizer] email];
hasOrganizer = ([organizerEmail length] > 0);
#if 1
ASSIGN (organizer, [iCalPerson elementWithTag: @"organizer"]);
[component setOrganizer: organizer];
if (hasAttendees)
{
SOGoUser *user;
id identity;
ASSIGN (organizer, [iCalPerson elementWithTag: @"organizer"]);
[component setOrganizer: organizer];
user = [SOGoUser userWithLogin: owner roles: nil];
identity = [user defaultIdentity];
[organizer setCn: [identity objectForKey: @"fullName"]];
@@ -1568,7 +1566,15 @@ RANGE(2);
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
}
}
else
{
organizer = nil;
}
[component setOrganizer: organizer];
#else
BOOL hasOrganizer, hasAttendees;
organizerEmail = [[component organizer] email];
hasOrganizer = ([organizerEmail length] > 0);
if (hasOrganizer)
{
if (isOwner && !hasAttendees)
@@ -1924,7 +1930,8 @@ RANGE(2);
toolbarFilename = @"SOGoEmpty.toolbar";
else
{
if ([clientObject isKindOfClass: [SOGoAppointmentObject class]])
if ([clientObject isKindOfClass: [SOGoAppointmentObject class]]
|| [clientObject isKindOfClass: [SOGoAppointmentOccurence class]])
toolbarFilename = @"SOGoAppointmentObject.toolbar";
else
toolbarFilename = @"SOGoTaskObject.toolbar";