LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '3823bd3cc970f67d1d304545984ce01cc2c32ac6' 

and '9b5272463fac61370796a5551a285c8f7d3dd24c'

Monotone-Parent: 3823bd3cc970f67d1d304545984ce01cc2c32ac6
Monotone-Parent: 9b5272463fac61370796a5551a285c8f7d3dd24c
Monotone-Revision: 4d3351a8b6b27006c2727b36d6fae250d5c24d40

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-23T21:25:07
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-12-23 21:25:07 +00:00
parent 1add40c6ff 4320805ece
commit 7163e4ed0b
7 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -4,6 +4,21 @@
useless method.
(-sharedAccountName): removed useless method.
2009-12-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* 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
* UI/Templates/ContactsUI/UIxContactFoldersView.wox
UI/Templates/SchedulerUI/UIxCalMainView.wox
Modified the uploadForm in those two templates (to add
const:href="") in order to avoid SOPE sessions being
created upon access to the calendar or address book module.
This fixes: http://www.scalableogo.org/bugs/view.php?id=208
2009-12-22 Ludovic Marcotte <lmarcotte@inverse.ca>
* Removed all the Kolab-related stuff (more specifically,

2
UI/Common/WODirectAction+SOGo.m
View File

@ -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 <wsourdeau@inverse.ca>
*

2
UI/Scheduler/UIxCalMainView.h
View File

@ -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 <wsourdeau@inverse.ca>
*

2
UI/Scheduler/UIxCalMonthView.h
View File

@ -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 <wsourdeau@inverse.ca>
*

38
UI/Scheduler/UIxCalView.m
View File

@ -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;

2
UI/Templates/ContactsUI/UIxContactFoldersView.wox
View File

@ -30,7 +30,7 @@
<div>
<h3><var:string label:value="Import Cards"/></h3>
<p><var:string label:value="Select a vCard or LDIF file."/></p>
<form name="uploadForm" id="uploadForm" method="post"
<form const:href="" name="uploadForm" id="uploadForm" method="post"
enctype="multipart/form-data"
onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm,
'onComplete' : uploadCompleted})">

2
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@ -103,7 +103,7 @@
<div>
<h3><var:string label:value="Import Events"/></h3>
<p><var:string label:value="Select an iCalendar file (.ics)."/></p>
<form name="uploadForm" id="uploadForm" method="post"
<form const:href="" name="uploadForm" id="uploadForm" method="post"
enctype="multipart/form-data"
onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm,
'onComplete' : uploadCompleted})">