added template to popup button

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index d8b90510e6dd0b855605802fb3164544955f4be3..af49508bf85c9194a1acb24f22fb211fc988489d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * DynamicElements/WOPopUpButton.m: added a template so that static
+         <option> elements can be embedded inside the <select> (v4.5.149)
+
 2005-04-04  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SoObjects/SoObjectRequestHandler.m: properly setup NGLogging so

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
index 73993c07cf6e9d242e8e663b3fc16dbaad370da4..99ee76aebb10af56f44fe48f7c1a2323f29df264 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOPopUpButton.m
@@ -39,6 +39,7 @@
   WOAssociation *selectedValue;     // WO4.5
   WOAssociation *escapeHTML;        // WO4.5
   WOAssociation *itemGroup;         // SOPE
+  WOElement     *template;          // SOPE?
 }
 
 @end
@@ -126,6 +127,8 @@ static NSNumber *yesNum = nil;
     self->selectedValue     = OWGetProperty(_config, @"selectedValue");
     self->escapeHTML        = OWGetProperty(_config, @"escapeHTML");
     self->itemGroup         = OWGetProperty(_config, @"itemGroup");
+
+    self->template = [_t retain];
     
     if (self->selection != nil && self->selectedValue != nil)
       [self logWithFormat:
@@ -138,7 +141,7 @@ static NSNumber *yesNum = nil;
     
     if (self->escapeHTML == nil)
       self->escapeHTML = [[WOAssociation associationWithValue:yesNum] retain];
-    
+
     [self _handleDeprecatedBindings:_config];
   }
   return self;
@@ -181,7 +184,7 @@ static NSNumber *yesNum = nil;
   objects = [self->list valueInComponent:sComponent];
       
   object = nil;
-  if (self->value) {
+  if (self->value != nil) {
     /* has a value binding, walk list to find object */
     unsigned i, toGo;
 
@@ -461,8 +464,9 @@ static NSNumber *yesNum = nil;
     WOResponse_AddCString(_response, " disabled=\"disabled\"");
 
   WOResponse_AddChar(_response, '>');
-
+  
   [self appendOptionsToResponse:_response inContext:_ctx];
+  [self->template appendToResponse:_response inContext:_ctx];
 
   WOResponse_AddCString(_response, "</select>");
   

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 5ffa36600b0dc86795063824953fccdafa2d6412..8bd48528867e4d00977cc49ebb9ada290029f00c 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=148
+SUBMINOR_VERSION:=149
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134