[Checkins] SVN: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/ Merged 1.5 branch r97439:97440 into shh-15-masquerading branch.
Stefan H. Holek
stefan at epy.co.at
Tue Mar 3 13:03:30 EST 2009
Log message for revision 97446:
Merged 1.5 branch r97439:97440 into shh-15-masquerading branch.
Changed:
U Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
U Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py
-=-
Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt 2009-03-03 16:27:07 UTC (rev 97445)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/doc/CHANGES.txt 2009-03-03 18:03:30 UTC (rev 97446)
@@ -4,6 +4,8 @@
PluggableAuthService 1.5.5 (unreleased)
---------------------------------------
+- Don't fail on users defined in multiple user sources on the ZODBGroupManager
+ listing page.
PluggableAuthService 1.5.4 (2008-11-20)
---------------------------------------
Modified: Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py 2009-03-03 16:27:07 UTC (rev 97445)
+++ Products.PluggableAuthService/branches/shh-15-masquerading/Products/PluggableAuthService/plugins/ZODBGroupManager.py 2009-03-03 18:03:30 UTC (rev 97446)
@@ -250,14 +250,12 @@
for k, v in self._principal_groups.items():
if group_id in v:
- # should be one and only one mapping to 'k'
-
parent = aq_parent( self )
info = parent.searchPrincipals( id=k, exact_match=True )
- assert( len( info ) in ( 0, 1 ) )
if len( info ) == 0:
title = '<%s: not found>' % k
else:
+ # always use the title of the first principal found
title = info[0].get( 'title', k )
result.append( ( k, title ) )
More information about the Checkins
mailing list