From cb6251fe9d088cae086eabe94f5bb219418f7bca Mon Sep 17 00:00:00 2001 From: wolfgang Date: Sat, 15 Sep 2007 02:32:18 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1175 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 3 ++ UI/Scheduler/UIxCalendarSelector.m | 2 ++ UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 ++ .../SchedulerUI/UIxCalendarSelector.wox | 3 +- UI/WebServerResources/ContactsUI.css | 2 +- UI/WebServerResources/SchedulerUI.js | 33 ++++++++++++++++++- UI/WebServerResources/generic.css | 2 +- 7 files changed, 43 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4c799c2..d879621d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-09-14 Wolfgang Sourdeau + * UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector + -calendars]): also returns the owner of the listed folders. + * SoObjects/Appointments/SOGoAppointmentFolder.m ([-deleteEntriesWithIds:ids]): moved method into SOGoFolder. diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m index e077176a..6bee8aad 100644 --- a/UI/Scheduler/UIxCalendarSelector.m +++ b/UI/Scheduler/UIxCalendarSelector.m @@ -129,6 +129,8 @@ colorForNumber (unsigned int number) forKey: @"color"]; isActive = [NSNumber numberWithBool: [folder isActive]]; [calendar setObject: isActive forKey: @"active"]; + [calendar setObject: [folder ownerInContext: context] + forKey: @"owner"]; [calendars addObject: calendar]; } } diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 9ab3d56d..4c5039a3 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -49,6 +49,8 @@