fixed OGo bug #888

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 9148a67c2ed8835f5e0592e2afcec94ff3096816..8ef217906fad1f9abfdecb3da4b6516aca00bb49 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-09  Helge Hess  <helge.hess@opengroupware.org>
+
+       * DynamicElements/WOBrowser.m: deprecated 'string' binding and
+         activated 'displayString' as requested in OGo bug #888 (v4.3.32)
+
 2004-09-09  Frank Reppin  <frank@opengroupware.org>
 
        * GNUmakefile.postamble: added patch for installing in different

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
index 066c87c9017a48f52b8e76e09e32fa1d2f87fc61..93a7435e40f320c6f79ebbaba049ce1cd7d8446d 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOInput.h"
 #include "common.h"
@@ -34,13 +33,15 @@
   WOAssociation *list;
   WOAssociation *item;
   WOAssociation *selection;
-  WOAssociation *string;            // WO4
+  WOAssociation *string;            // WO4 => use 'displayString'!
   WOAssociation *noSelectionString; // WO4
   
   // non-WO:
   WOAssociation *singleSelection; // selection contains an item, not an array
   WOAssociation *multiple; // multiple selections allowed
   WOAssociation *size;
+
+  // TODO: WO 4.5: selectedValues, escapeHTML, selections
 }
 
 @end /* WOBrowser */
@@ -65,12 +66,23 @@
     self->list              = OWGetProperty(_config, @"list");
     self->item              = OWGetProperty(_config, @"item");
     self->selection         = OWGetProperty(_config, @"selection");
-    self->string            = OWGetProperty(_config, @"string");
     self->singleSelection   = OWGetProperty(_config, @"singleSelection");
     self->multiple          = OWGetProperty(_config, @"multiple");
     self->size              = OWGetProperty(_config, @"size");
     self->noSelectionString = OWGetProperty(_config, @"noSelectionString");
-
+    
+    if ((self->string = OWGetProperty(_config, @"displayString")) == nil) {
+      if ((self->string = OWGetProperty(_config, @"string")) != nil) {
+       [self debugWithFormat:
+               @"Note: using deprecated 'string' binding, "
+               @"use 'displayString' instead."];
+      }
+    }
+    else if (OWGetProperty(_config, @"string") != nil) {
+      [self debugWithFormat:@"WARNING: 'displayString' AND 'string' bindings "
+             @"are set, use only one! ('string' is deprecated!)"];
+    }
+    
     // compatiblity
     if (self->noSelectionString == nil)
       self->noSelectionString = OWGetProperty(_config, @"nilString");
@@ -85,14 +97,14 @@
 }
 
 - (void)dealloc {
-  RELEASE(self->noSelectionString);
-  RELEASE(self->singleSelection);
-  RELEASE(self->list);
-  RELEASE(self->item);
-  RELEASE(self->selection);
-  RELEASE(self->string);
-  RELEASE(self->size);
-  RELEASE(self->multiple);
+  [self->noSelectionString release];
+  [self->singleSelection   release];
+  [self->list      release];
+  [self->item      release];
+  [self->selection release];
+  [self->string    release];
+  [self->size      release];
+  [self->multiple  release];
   [super dealloc];
 }
 

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
index de38a5a822033617f357f888d295e865c3a85a8c..648f6efc8b59afa1ca4735b97e934109b455f300 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m
@@ -403,7 +403,7 @@ static WOAssociation *yesAssoc = nil;
     if (self->nilString != nil && self->valueWhenEmpty != nil) {
       [self logWithFormat:
              @"WARNING: 'valueWhenEmpty' AND 'nilString' bindings are set, "
-             @"use only one! (nilString is deprecated!)"];
+             @"use only one! ('nilString' is deprecated!)"];
     }
     else if (self->nilString != nil) {
       [self debugWithFormat:

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 3bdd746f09cebab8e9d6a4ad1b6848774bc8a1b9..7fdcd491a4c1d350652de08b13b02143a43cc139 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=31
+SUBMINOR_VERSION:=32
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77