mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-19 18:35:25 +00:00
Monotone-Parent: b3104cb2f524576b6a02514df135076db60274ea
Monotone-Revision: 1471bacc37d4bfc7718c85c0760024d89c4440ef Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-09T19:23:45 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -40,7 +40,6 @@
|
||||
#import <NGObjWeb/NSException+HTTP.h>
|
||||
#import <NGObjWeb/WORequest.h>
|
||||
|
||||
#import <SOGo/AgenorUserManager.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGoUI/SOGoDateFormatter.h>
|
||||
#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
|
||||
@@ -48,7 +47,7 @@
|
||||
#import <SoObjects/Appointments/SOGoTaskObject.h>
|
||||
#import <SoObjects/SOGo/NSString+Utilities.h>
|
||||
|
||||
#import "UIxComponent+Agenor.h"
|
||||
#import "UIxComponent+Scheduler.h"
|
||||
|
||||
#import "UIxComponentEditor.h"
|
||||
|
||||
@@ -653,8 +652,7 @@
|
||||
|
||||
- (BOOL) isMyComponent
|
||||
{
|
||||
// TODO: this should check a set of emails against the SoUser
|
||||
return ([[organizer rfc822Email] isEqualToString: [self emailForUser]]);
|
||||
return ([[context activeUser] hasEmail: [organizer rfc822Email]]);
|
||||
}
|
||||
|
||||
- (BOOL) canEditComponent
|
||||
@@ -794,6 +792,7 @@
|
||||
- (void) _handleOrganizer
|
||||
{
|
||||
NSString *organizerEmail;
|
||||
SOGoUser *activeUser;
|
||||
|
||||
organizerEmail = [[component organizer] email];
|
||||
if ([organizerEmail length] == 0)
|
||||
@@ -801,8 +800,9 @@
|
||||
if ([[component attendees] count] > 0)
|
||||
{
|
||||
ASSIGN (organizer, [iCalPerson elementWithTag: @"organizer"]);
|
||||
[organizer setCn: [self cnForUser]];
|
||||
[organizer setEmail: [self emailForUser]];
|
||||
activeUser = [context activeUser];
|
||||
[organizer setCn: [activeUser cn]];
|
||||
[organizer setEmail: [activeUser primaryEmail]];
|
||||
[component setOrganizer: organizer];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user