enable the use of arrays in the declaration of default roles for a permission in...

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index d833dda344b0924d9111b5a76d14f10245fd0f14..b43e9fa0165de052557ac9812e6e42c3fc1d3eef 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-23  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+       * SoObjects/SoProductClassInfo.m: enable the use of arrays in the
+         declaration of default roles for a permission in product.plist files
+         (v4.5.257)
+
 2006-11-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * WEClientCapabilities.m: added Sunbird as a known user-agent

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m b/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
index 17c95ea65cb49297797063e8e90c9cff6fde606c..f21a407d14fc2a460e83dbd686ec591f90d38f21 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoProductClassInfo.m
@@ -119,9 +119,16 @@ static int loadDebugOn = 0;
     
     perms = [self->roleInfo keyEnumerator];
     while ((perm = [perms nextObject]) != nil) {
-      NSString *role = [self->roleInfo objectForKey:perm];
+      id role = [self->roleInfo objectForKey:perm];
       
-      [_security declareRole:role asDefaultForPermission:perm];
+      if ([role isKindOfClass:[NSArray class]])
+       [_security declareRoles:role asDefaultForPermission:perm];
+      else if ([role isKindOfClass:[NSString class]])
+       [_security declareRole:role asDefaultForPermission:perm];
+      else {
+       [self warnWithFormat:
+               @"unexpected 'role' value (expect string or array): %@", role];
+      }
     }
   }
 }

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 8d291ac6cd24de3b430d4f9a26ae57757d1f4995..4d722dcbecf2f9c4a21f63d68f8d840f45e18431 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -3,7 +3,7 @@
 ifeq ($(GNUSTEP_HOST_VENDOR),apple) # linker overflow
 SUBMINOR_VERSION:=255
 else
-SUBMINOR_VERSION:=256
+SUBMINOR_VERSION:=257
 endif
 
 # v4.5.234 requires libDOM          v4.5.21