expose radio-button-list in WOx

minor WOString cleanups

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 8ee1dfa242ca04b5b2bee98742943475baf48822..a2c14bbb06990b4dd78ad91810cb7ee4a7764a99 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-31  Helge Hess  <helge.hess@skyrix.com>
+
+       * v4.5.194
+
+       * DynamicElements/WOString.m: minor code cleanups
+
+       * DynamicElements/WOxMiscElemBuilder.m: removed generation of
+         radio-button-matrix (which is part of WOExtensions), added generation
+         of WORadioButtonList (<var:radio-button-list/>)
+
 2005-08-27  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: improved dependency handling (v4.5.193)

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
index 25590cc61efa81e4aaeee534da527b8bd303ee4d..baf90e4dd3ea9a123c3d8f25e3519821209b6bdf 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
@@ -578,15 +578,15 @@ static WOAssociation *yesAssoc = nil;
 
   /* handling of empty and nil values */
 
-  if (self->valueWhenEmpty) {
-    if (obj == nil || [obj length] == 0) {
+  if (self->valueWhenEmpty != nil) {
+    if (![obj isNotEmpty]) {
       NSString *s;
       
       s = [self->valueWhenEmpty stringValueInComponent:sComponent];
       
       /* Note: the missing escaping is intentional for WO 4.5 compatibility */
       if (s != nil) {
-        if (styleName) {
+        if (styleName != nil) {
           [_response appendContentString:@"<span class=\""];
           [_response appendContentHTMLAttributeValue:styleName];
           [_response appendContentString:@"\">"];
@@ -599,7 +599,7 @@ static WOAssociation *yesAssoc = nil;
   else if (self->nilString != nil && obj == nil) {
     NSString *s;
 
-    if (styleName) {
+    if (styleName != nil) {
       [_response appendContentString:@"<span class=\""];
       [_response appendContentHTMLAttributeValue:styleName];
       [_response appendContentString:@"\">"];
@@ -613,7 +613,7 @@ static WOAssociation *yesAssoc = nil;
 
   /* handling of non-empty values */
   
-  if (styleName) {
+  if (styleName != nil) {
     [_response appendContentString:@"<span class=\""];
     [_response appendContentHTMLAttributeValue:styleName];
     [_response appendContentString:@"\">"];

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
index 88c42a76ab07d51a24cd63bdf928feeb72419644..a76259cdb84bf2b6f75cfadfcfb0f4227099f455 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxMiscElemBuilder.m
@@ -35,7 +35,7 @@
     <var:popup ../>                maps to WOPopUpButton
     <var:singleselection ../>      maps to WOBrowser
     <var:multiselection .../>      maps to WOBrowser
-    <var:radio-button-matrix .../> maps to WORadioButtonMatrix
+    <var:radio-button-list .../>   maps to WORadioButtonList
     <var:checkbox-list .../>       maps to WOCheckBoxList
 */
 
@@ -98,10 +98,10 @@
       if ([tag isEqualToString:@"popup"])
         return NSClassFromString(@"WOPopUpButton");
       break;
-
+      
     case 'r':
-      if ([tag isEqualToString:@"radio-button-matrix"])
-        return NSClassFromString(@"WORadioButtonMatrix");
+      if ([tag isEqualToString:@"radio-button-list"])
+        return NSClassFromString(@"WORadioButtonList");
       break;
       
     case 's':

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index a85a8f3036227c48de6330da6d1a5a0ab238c8d6..84816ceba4eaed2b226613914f120f1e19f1fc34 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=193
+SUBMINOR_VERSION:=194
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134