Monotone-Parent: 21cd67b802d7be6973e4f0cf16a68dfb3497f3a5

Monotone-Revision: 4f7d023c13f9dc0dfc9d9334f0a8ce9e345493ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-21T14:49:48
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2007-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailMainFrame.m ([UIxMailMainFrame
+	-composeAction]): restored method since it is needed by the
+	address book.
+
 	* UI/MailerUI/UIxMailAccountActions.m ([UIxMailAccountActions
 	-composeAction]): the address fields should be arrays and not
 	simple strings.

UI/MailerUI/UIxMailMainFrame.m

@@ -26,6 +26,7 @@
 
 #import <SoObjects/Mailer/SOGoMailObject.h>
 #import <SoObjects/Mailer/SOGoMailAccounts.h>
+#import <SoObjects/SOGo/NSDictionary+URL.h>
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SOGoUI/UIxComponent.h>
@@ -90,4 +91,23 @@
   return [u hasSuffix:@"/"] ? @"view" : @"#";
 }
 
+- (id <WOActionResults>) composeAction
+{
+  NSArray *accounts;
+  NSString *firstAccount, *newLocation;
+  SOGoMailAccounts *co;
+  NSDictionary *formValues;
+
+  co = [self clientObject];
+  accounts = [[context activeUser] mailAccounts];
+  firstAccount = [[accounts objectsForKey: @"name"] objectAtIndex: 0];
+  formValues = [[context request] formValues];
+  newLocation = [NSString stringWithFormat: @"%@/%@/compose%@",
+			  [co baseURLInContext: context],
+			  firstAccount,
+			  [formValues asURLParameters]];
+
+  return [self redirectToLocation: newLocation];
+}
+
 @end /* UIxMailMainFrame */

UI/MailerUI/product.plist

@@ -256,9 +256,10 @@ categories = {
 	    protectedBy = "View";
 	    pageName    = "UIxMailMainFrame";
 	 };
-	 getMail = {
+	 compose = {
 	    protectedBy = "View";
-	    pageName    = "UIxMailAccountsView";
+	    pageName    = "UIxMailMainFrame";
+	    actionName = "compose";
 	 };
       };
    };