Monotone-Parent: 55bd0aadaff660782e65e1546472acf441f5dea3
Monotone-Revision: eafd57a183951ea94317f3d82256da0692581d9e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-12T18:32:52 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
65a08b56cd
commit
98fab548fb
|
@ -1,5 +1,10 @@
|
|||
2010-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Appointments/SOGoAptMailReceipt.m (-getSubject)
|
||||
(-getBody): taken methods from old version of
|
||||
SOGoAptMailNotification, to avoid a crash regarding a lock of
|
||||
method override.
|
||||
|
||||
* UI/WebServerResources/SOGoTabsController.js: new js module for
|
||||
handling tabs, replacing non-object code from generic.js. Added
|
||||
handling of tab overflows, with the appearance of two left/right
|
||||
|
|
|
@ -43,7 +43,6 @@
|
|||
NSTimeZone *viewTZ;
|
||||
NSCalendarDate *oldStartDate;
|
||||
NSCalendarDate *newStartDate;
|
||||
BOOL isSubject;
|
||||
NSString *organizerName;
|
||||
NSMutableDictionary *values;
|
||||
}
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
NSString *originator;
|
||||
NSArray *recipients;
|
||||
iCalPerson *currentRecipient;
|
||||
BOOL isSubject;
|
||||
}
|
||||
|
||||
- (void) setOriginator: (NSString *) newOriginator;
|
||||
|
|
|
@ -21,12 +21,16 @@
|
|||
*/
|
||||
|
||||
#import <Foundation/NSCalendarDate.h>
|
||||
#import <Foundation/NSCharacterSet.h>
|
||||
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
#import <NGCards/iCalEvent.h>
|
||||
#import <NGCards/iCalPerson.h>
|
||||
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
#import <SOGo/SOGoUserManager.h>
|
||||
#import <SOGo/SOGoDateFormatter.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
|
@ -34,7 +38,7 @@
|
|||
#import "SOGoAptMailReceipt.h"
|
||||
|
||||
static SOGoUserManager *um = nil;
|
||||
|
||||
static NSCharacterSet *wsSet = nil;
|
||||
|
||||
@implementation SOGoAptMailReceipt
|
||||
|
||||
|
@ -42,6 +46,9 @@ static SOGoUserManager *um = nil;
|
|||
{
|
||||
if (!um)
|
||||
um = [SOGoUserManager sharedUserManager];
|
||||
|
||||
if (!wsSet)
|
||||
wsSet = [[NSCharacterSet whitespaceAndNewlineCharacterSet] retain];
|
||||
}
|
||||
|
||||
- (id) init
|
||||
|
@ -50,6 +57,7 @@ static SOGoUserManager *um = nil;
|
|||
{
|
||||
originator = nil;
|
||||
recipients = nil;
|
||||
isSubject = NO;
|
||||
}
|
||||
|
||||
return self;
|
||||
|
@ -62,6 +70,36 @@ static SOGoUserManager *um = nil;
|
|||
[super dealloc];
|
||||
}
|
||||
|
||||
|
||||
- (NSString *) getSubject
|
||||
{
|
||||
NSString *subject;
|
||||
|
||||
isSubject = YES;
|
||||
subject = [[[self generateResponse] contentAsString]
|
||||
stringByTrimmingCharactersInSet: wsSet];
|
||||
if (!subject)
|
||||
{
|
||||
[self errorWithFormat:@"Failed to properly generate subject! Please check "
|
||||
@"template for component '%@'!",
|
||||
[self name]];
|
||||
subject = @"ERROR: missing subject!";
|
||||
}
|
||||
|
||||
return [subject asQPSubjectString: @"utf-8"];
|
||||
}
|
||||
|
||||
- (NSString *) getBody
|
||||
{
|
||||
NSString *body;
|
||||
|
||||
isSubject = NO;
|
||||
|
||||
body = [[self generateResponse] contentAsString];
|
||||
|
||||
return [body stringByTrimmingCharactersInSet: wsSet];
|
||||
}
|
||||
|
||||
- (void) setOriginator: (NSString *) newOriginator
|
||||
{
|
||||
ASSIGN (originator, newOriginator);
|
||||
|
|
Loading…
Reference in New Issue