minor tweaks

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@316 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index a5b060122c3d6c9d0125eff2cfb4010d384787b3..76bc4c48878b44d2456136274bf9bd05d9fcd449 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * DynamicElements/WOxHTMLElemBuilder.m: select WOSubmitButton for
+         <input type="button"> in .wox files (should be fixed) (v4.3.76)
+
+2004-10-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SoObjects/SoUser.m: just return nil for unsupported KVC keys
+         (v4.3.75)
+
 2004-10-23  Helge Hess  <helge.hess@opengroupware.org>
        
        * v4.3.74

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m b/sope-appserver/NGObjWeb/DynamicElements/WOFileUpload.m
index cbf8af6dc476ce382e64ea3be280fd3ef387c0d8..33f7d5381d7c80e5c009827f3717855c8213d1e9 100644 (file)
--- 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 a1165e853a81513f41e217c6a46730348810e483..fe57703a5de61e1683df10c77d6bf8fc98c18e1a 100644 (file)
--- 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 914d2ba697f4f4d5196ed3603ba2efdf927f7b68..4eb31c858b0e6e5dcbbca32b37b585288ee5fe10 100644 (file)
--- 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 <NGObjWeb/WOxElemBuilder.h>
 
@@ -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
     <a>..</a>         maps to WOHyperlink
     <img .../>        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 0cde44c25e7d6455c5ada019bfcc3ab1825063ad..e16b3d90c462304ba709a62353eec95821ea8a64 100644 (file)
--- 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 7354194d6b84063ddd08d777d96b9d47f50df7dc..ac63fc91b1e7e331cac8b561f0288f84625af659 100644 (file)
--- 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 241d51423be067ff0f0a43b29a07a1b76b3534f0..ddadfa5f2fbc49d00ba096a6fda4f3848d592c34 100644 (file)
--- 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