From cbc87fc9ab7be40947e8fe202679798732be393c Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 23 Dec 2009 20:14:53 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 06d8a080e505b11bad76b3afa0c1ffa5aa02bc23 Monotone-Revision: 5c327b5b1200ffed4317126e637f1e5a4a6947fb Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-12-23T20:14:53 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 +++++++ UI/Common/WODirectAction+SOGo.m | 2 +- UI/Scheduler/UIxCalMainView.h | 2 +- UI/Scheduler/UIxCalMonthView.h | 2 +- UI/Scheduler/UIxCalView.m | 38 ++++++--------------------------- 5 files changed, 17 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42a4cbb8d..24ebbdc72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-12-23 Ludovic Marcotte + + * UI/Scheduler/UIxCalView.m + Don't call -configureFormatters in -init as it'll + invoke labelForKey prior to setPage: - resulting + in the wrong resources manager being selected. + This fixes: http://www.scalableogo.org/bugs/view.php?id=286 + 2009-12-22 Ludovic Marcotte * Removed all the Kolab-related stuff (more specifically, diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m index 68564c152..0e7e40001 100644 --- a/UI/Common/WODirectAction+SOGo.m +++ b/UI/Common/WODirectAction+SOGo.m @@ -1,6 +1,6 @@ /* WODirectAction+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007 Inverse inc. + * Copyright (C) 2007-2009 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMainView.h b/UI/Scheduler/UIxCalMainView.h index 19c9ce389..4128a7ce2 100644 --- a/UI/Scheduler/UIxCalMainView.h +++ b/UI/Scheduler/UIxCalMainView.h @@ -1,6 +1,6 @@ /* UIxCalMainView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse inc. + * Copyright (C) 2006-2009 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalMonthView.h b/UI/Scheduler/UIxCalMonthView.h index 3ffeea6e8..431b78f6a 100644 --- a/UI/Scheduler/UIxCalMonthView.h +++ b/UI/Scheduler/UIxCalMonthView.h @@ -1,6 +1,6 @@ /* UIxCalMonthView.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse inc. + * Copyright (C) 2006-2009 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index 6d38a3e8f..382eba9bc 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -74,7 +74,6 @@ = [[SOGoAptFormatter alloc] initWithDisplayTimeZone: timeZone]; privateAptTooltipFormatter = [[SOGoAptFormatter alloc] initWithDisplayTimeZone: timeZone]; - [self configureFormatters]; componentsData = [NSMutableDictionary new]; } @@ -182,37 +181,6 @@ ASSIGN (appointment, _apt); } -// - (void) setAppointment:(id) _apt -// { -// NSString *mailtoChunk; -// NSString *myEmail; -// NSString *partmails; - -// ASSIGN(appointment, _apt); - -// /* cache some info about apt for faster access */ - -// mailtoChunk = [_apt valueForKey: @"orgmail"]; -// myEmail = [self emailForUser]; -// if ([mailtoChunk rangeOfString: myEmail].length > 0) -// { -// aptFlags.isMyApt = YES; -// aptFlags.canAccessApt = YES; -// } -// else -// { -// aptFlags.isMyApt = NO; - -// partmails = [_apt valueForKey: @"partmails"]; -// if ([partmails rangeOfString: myEmail].length) -// aptFlags.canAccessApt = YES; -// else -// aptFlags.canAccessApt -// = ([[_apt valueForKey: @"classification"] intValue] -// == iCalAccessPublic); -// } -// } - - (id) appointment { return appointment; @@ -248,6 +216,9 @@ - (SOGoAptFormatter *) aptFormatter { + if (![aptFormatter titlePlaceholder]) + [self configureFormatters]; + if (aptFlags.canAccessApt) return aptFormatter; return privateAptFormatter; @@ -255,6 +226,9 @@ - (SOGoAptFormatter *) aptTooltipFormatter { + if (![aptTooltipFormatter titlePlaceholder]) + [self configureFormatters]; + if (aptFlags.canAccessApt) return aptTooltipFormatter; return privateAptTooltipFormatter;