From c3f90911969fee3632690b01fb7e813b615733df Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Dec 2007 15:51:37 +0000 Subject: [PATCH] Monotone-Parent: 558ad53328c167b68815d36374a3c2d92055f0b2 Monotone-Revision: 6a48cdb414ef6ca38666c4558e55a983da0b1cdf Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-12-17T15:51:37 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailMainFrame.m | 5 +++-- UI/WebServerResources/ContactsUI.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 400e32802..e45d9d301 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -119,7 +119,7 @@ - (id ) composeAction { NSArray *accounts; - NSString *firstAccount, *newLocation; + NSString *firstAccount, *newLocation, *parameters; SOGoMailAccounts *co; NSDictionary *formValues; @@ -127,10 +127,11 @@ accounts = [[context activeUser] mailAccounts]; firstAccount = [[accounts objectsForKey: @"name"] objectAtIndex: 0]; formValues = [[context request] formValues]; + parameters = [formValues count] > 0 ? [formValues asURLParameters] : @"?mailto="; newLocation = [NSString stringWithFormat: @"%@/%@/compose%@", [co baseURLInContext: context], firstAccount, - [formValues asURLParameters]]; + parameters]; return [self redirectToLocation: newLocation]; } diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 9c7bcf587..21c9872f2 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -353,7 +353,7 @@ function onToolbarWriteToSelectedContacts(event) { var rowsWithEmail = 0; if (rows.length == 0) { - window.alert(labels["Please select a contact."]); + openMailComposeWindow(ApplicationBaseURL + "Mail/compose"); return false; }