From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 9 Sep 2004 21:20:57 +0000 (+0000)
Subject: fixed OGo bug #894
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd4843ea229d39a280a851d331828a7999c955e9;p=sope

fixed OGo bug #894


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 8ef21790..06a95e40 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-09  Helge Hess  <helge.hess@opengroupware.org>
 
+	* DynamicElements/WOBrowser.m: deprecated 'selection' binding and
+	  activated 'selections' as requested in OGo bug #894 (v4.3.33)
+	
 	* DynamicElements/WOBrowser.m: deprecated 'string' binding and
 	  activated 'displayString' as requested in OGo bug #888 (v4.3.32)
 
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
index 93a7435e..508989d5 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOBrowser.m
@@ -32,16 +32,18 @@
 @protected
   WOAssociation *list;
   WOAssociation *item;
-  WOAssociation *selection;
+  WOAssociation *selection;         // => use 'selections'!
   WOAssociation *string;            // WO4 => use 'displayString'!
   WOAssociation *noSelectionString; // WO4
   
   // non-WO:
   WOAssociation *singleSelection; // selection contains an item, not an array
+  
+  // WO 4.5
   WOAssociation *multiple; // multiple selections allowed
   WOAssociation *size;
 
-  // TODO: WO 4.5: selectedValues, escapeHTML, selections
+  // TODO: WO 4.5: selectedValues, escapeHTML
 }
 
 @end /* WOBrowser */
@@ -65,7 +67,6 @@
   if ((self = [super initWithName:_name associations:_config template:_c])) {
     self->list              = OWGetProperty(_config, @"list");
     self->item              = OWGetProperty(_config, @"item");
-    self->selection         = OWGetProperty(_config, @"selection");
     self->singleSelection   = OWGetProperty(_config, @"singleSelection");
     self->multiple          = OWGetProperty(_config, @"multiple");
     self->size              = OWGetProperty(_config, @"size");
@@ -83,6 +84,18 @@
 	      @"are set, use only one! ('string' is deprecated!)"];
     }
     
+    if ((self->selection = OWGetProperty(_config, @"selections")) == nil) {
+      if ((self->selection = OWGetProperty(_config, @"selection")) == nil) {
+	[self debugWithFormat:
+		@"Note: using deprecated 'selection' binding, "
+	        @"use 'selections' instead."];
+      }
+    }
+    else if (OWGetProperty(_config, @"selection") != nil) {
+      [self debugWithFormat:@"WARNING: 'selections' AND 'selection' bindings "
+	      @"are set, use only one! ('selection' is deprecated!)"];
+    }
+    
     // compatiblity
     if (self->noSelectionString == nil)
       self->noSelectionString = OWGetProperty(_config, @"nilString");
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 7fdcd491..8ee1ad73 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33
 
 # v4.2.413 requires libSaxObjC      v4.2.33
 # v4.2.341 requires libNGExtensions v4.2.77