From 23f7a9ef43aec1f72fc35090f4adf0edfd59e1c5 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 26 Oct 2004 14:15:05 +0000 Subject: [PATCH] minor tweaks git-svn-id: http://svn.opengroupware.org/SOPE/trunk@316 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 10 ++++++++++ .../NGObjWeb/DynamicElements/WOFileUpload.m | 13 ++++++------- sope-appserver/NGObjWeb/DynamicElements/WOForm.m | 1 - .../NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m | 8 +++++++- .../NGObjWeb/SoObjects/SoSelectorInvocation.m | 1 - sope-appserver/NGObjWeb/SoObjects/SoUser.m | 11 ++++++++--- sope-appserver/NGObjWeb/Version | 2 +- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index a5b06012..76bc4c48 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,13 @@ +2004-10-26 Helge Hess + + * DynamicElements/WOxHTMLElemBuilder.m: select WOSubmitButton for + in .wox files (should be fixed) (v4.3.76) + +2004-10-25 Helge Hess + + * SoObjects/SoUser.m: just return nil for unsupported KVC keys + (v4.3.75) + 2004-10-23 Helge Hess * v4.3.74 diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m index cbf8af6d..33f7d538 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m @@ -49,19 +49,18 @@ static NGMimeType *multipartFormData = nil; + (void)initialize { static BOOL isInitialized = NO; - if (!isInitialized) { - isInitialized = YES; + if (isInitialized) return; + isInitialized = YES; - multipartFormData = [NGMimeType mimeType:@"multipart/form-data"]; - multipartFormData = RETAIN(multipartFormData); - } + multipartFormData = [[NGMimeType mimeType:@"multipart/form-data"] retain]; } - (id)initWithName:(NSString *)_name associations:(NSDictionary *)_config - template:(WOElement *)_root { + template:(WOElement *)_t +{ - if ((self = [super initWithName:_name associations:_config template:_root])) { + if ((self = [super initWithName:_name associations:_config template:_t])) { self->filePath = OWGetProperty(_config, @"filePath"); self->data = OWGetProperty(_config, @"data"); } diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m index a1165e85..fe57703a 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "WOForm.h" #include "WOElement+private.h" diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m index 914d2ba6..4eb31c85 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOxHTMLElemBuilder.m @@ -18,7 +18,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ +// $Id: WOxHTMLElemBuilder.m 1 2004-08-20 10:08:27Z znek $ #import @@ -41,6 +41,7 @@ type="file" maps to WOFileUpload type="hidden" maps to WOHiddenField type="password" maps to WOPasswordField + TODO: button! all other map to WOTextField .. maps to WOHyperlink maps to WOImage @@ -107,6 +108,11 @@ return NSClassFromString(@"WOSubmitButton"); else if (c1 == 'h' && [type isEqualToString:@"hidden"]) return NSClassFromString(@"WOHiddenField"); + else if (c1 == 'b' && [type isEqualToString:@"button"]) { + [self logWithFormat:@"WARNING: selecting WOSubmitButton for " + @"input with type 'button' !"]; + return NSClassFromString(@"WOSubmitButton"); + } break; case 8: diff --git a/sope-appserver/NGObjWeb/SoObjects/SoSelectorInvocation.m b/sope-appserver/NGObjWeb/SoObjects/SoSelectorInvocation.m index 0cde44c2..e16b3d90 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoSelectorInvocation.m +++ b/sope-appserver/NGObjWeb/SoObjects/SoSelectorInvocation.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoSelectorInvocation.h" #include "SoClassSecurityInfo.h" diff --git a/sope-appserver/NGObjWeb/SoObjects/SoUser.m b/sope-appserver/NGObjWeb/SoObjects/SoUser.m index 7354194d..ac63fc91 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoUser.m +++ b/sope-appserver/NGObjWeb/SoObjects/SoUser.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoUser.h" #include "common.h" @@ -74,6 +73,12 @@ return aroles; } +/* KVC */ + +- (id)valueForUndefinedKey:(NSString *)_key { + return nil; +} + /* description */ - (NSString *)description { diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 241d5142..ddadfa5f 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=74 +SUBMINOR_VERSION:=76 # v4.3.42 requires libNGExtensions v4.3.116 # v4.3.40 requires libNGExtensions v4.3.115 -- 2.39.5