Monotone-Parent: 6de228594e5feb001f4208313d8363017d61a463

Monotone-Revision: b83048b6a7cb04b3bd23bb087f18cf0d7c495d49

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-12T16:42:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-10-12 16:42:59 +00:00
parent 9fa766dae5
commit 142dff8d5e
12 changed files with 117 additions and 260 deletions
+21 -15
View File
@@ -19,7 +19,7 @@
02111-1307, USA.
*/
#include <SOGoUI/UIxComponent.h>
#import <SOGoUI/UIxComponent.h>
/*
UIxMailEditor
@@ -48,16 +48,16 @@
@end
#include <SoObjects/Mailer/SOGoDraftObject.h>
#include <SoObjects/Mailer/SOGoMailFolder.h>
#include <SoObjects/Mailer/SOGoMailAccount.h>
#include <SoObjects/Mailer/SOGoMailAccounts.h>
#include <SoObjects/Mailer/SOGoMailIdentity.h>
#include <SoObjects/SOGo/WOContext+Agenor.h>
#include <NGMail/NGMimeMessage.h>
#include <NGMail/NGMimeMessageGenerator.h>
#include <NGObjWeb/SoSubContext.h>
#include "common.h"
#import <SoObjects/Mailer/SOGoDraftObject.h>
#import <SoObjects/Mailer/SOGoMailFolder.h>
#import <SoObjects/Mailer/SOGoMailAccount.h>
#import <SoObjects/Mailer/SOGoMailAccounts.h>
#import <SoObjects/Mailer/SOGoMailIdentity.h>
#import <SoObjects/SOGo/WOContext+Agenor.h>
#import <NGMail/NGMimeMessage.h>
#import <NGMail/NGMimeMessageGenerator.h>
#import <NGObjWeb/SoSubContext.h>
#import "common.h"
@implementation UIxMailEditor
@@ -491,11 +491,13 @@ static NSArray *infoKeys = nil;
return nil;
}
- (id)sendAction {
- (id <WOActionResults>) sendAction
{
NSException *error;
NSString *mailPath;
NSDictionary *h;
id <WOActionResults> result;
// TODO: need to validate whether we have a To etc
/* first, save form data */
@@ -553,8 +555,12 @@ static NSArray *infoKeys = nil;
if ((error = [[self clientObject] delete]) != nil)
return error;
// if everything is ok, close the window (send a JS closing the Window)
return [self pageWithName:@"UIxMailWindowCloser"];
if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
result = [self redirectToLocation: [self applicationPath]];
else
result = [self jsCloseWithRefreshMethod: nil];
return result;
}
- (id)deleteAction {