string-value shortcut in product.plist

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index af8f40c1149550a3425bf8fb507764680722d3a4..383c14859dd6e211921d7782bd194d540a5e0c2d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-30  Helge Hess  <helge.hess@skyrix.com>
+
+       * SoObjects/SoProductClassInfo.m: allow plain string values for slots
+         in product.plist (v4.5.161)
+
 2005-05-05  Helge Hess  <helge.hess@opengroupware.org>
 
        * WEClientCapabilities.m: added Perl HTTP::DAV as a known WebDAV user

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m b/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
index d4ef97dc8938b63a196ed2763365df75d5032387..d72ced189744595df76310dbe37ddbb4938c8229 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
@@ -514,6 +514,11 @@ static int loadDebugOn = 0;
   NSString *valueClassName;
   Class    valueClass;
   id value;
+
+  if ([_m isKindOfClass:[NSString class]]) {
+    /* user used: slots = { abc = 15; } */
+    _m = [NSDictionary dictionaryWithObject:_m forKey:@"value"];
+  }
   
   /* security */
   
@@ -537,7 +542,7 @@ static int loadDebugOn = 0;
   else
     valueClass = Nil;
   
-  if ((value = [_m objectForKey:@"value"])) {
+  if ((value = [_m objectForKey:@"value"]) != nil) {
     if (valueClass) {
       value = [self instantiateObjectOfClass:valueClass withPlist:value];
       

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 21496a2b943b7f10a3e529c4b30bbfb9294236ce..82d5051ff61f8353328cb116194ee5af004341c5 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=160
+SUBMINOR_VERSION:=161
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134