Fixed file names in export, fixed crash in calendar export (nmap)

Monotone-Parent: bf532fa24ea4975a9b011b8c5956f67c0bb4c585
Monotone-Revision: 887faee9965f210d3622bac3e22440794bfd1ed5

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-22T17:24:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert 2009-09-22 17:24:25 +00:00
parent 59931862ff
commit ced6bfdeee
3 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2009-09-22 Cyril Robert <crobert@inverse.ca>
* UI/Scheduler/UIxCalFolderActions.m (exportAction): Used bareFetchFields from
SOGoAppointmentFolder instead of fetchFields from SOGoGCSFolder.
2009-09-22 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2009-09-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailListView.m (+initialize): new method * UI/MailerUI/UIxMailListView.m (+initialize): new method

View file

@ -80,8 +80,8 @@
} }
} }
filename = [NSString stringWithFormat: @"attachment;filename=%@.ldif", filename = [NSString stringWithFormat: @"attachment;filename=\"%@.ldif\"",
[self labelForKey: @"Contacts"]]; [folder displayName]];
response = [context response]; response = [context response];
[response setHeader: @"text/directory; charset=utf-8" [response setHeader: @"text/directory; charset=utf-8"
forKey: @"content-type"]; forKey: @"content-type"];

View file

@ -58,7 +58,12 @@
folder = [self clientObject]; folder = [self clientObject];
calendar = [iCalCalendar groupWithTag: @"vcalendar"]; calendar = [iCalCalendar groupWithTag: @"vcalendar"];
array = [[folder ocsFolder] fetchFields: fields matchingQualifier: nil]; array = [folder bareFetchFields: fields
from: nil
to: nil
title: nil
component: nil
additionalFilters: nil];
count = [array count]; count = [array count];
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
@ -84,8 +89,8 @@
[calendar addChildren: values]; [calendar addChildren: values];
} }
filename = [NSString stringWithFormat: @"attachment;filename=%@.ics", filename = [NSString stringWithFormat: @"attachment;filename=\"%@.ics\"",
[self labelForKey: @"Calendar"]]; [folder displayName]];
[response setHeader: @"text/calendar; charset=utf-8" [response setHeader: @"text/calendar; charset=utf-8"
forKey:@"content-type"]; forKey:@"content-type"];
[response setHeader: filename [response setHeader: filename