[Checkins] SVN: Products.PluggableAuthService/trunk/Products/PluggableAuthService/ Merged c97440 from 1.5 branch

[Hanno Schlichting]

Log message for revision 97441:
  Merged c97440 from 1.5 branch
  

Changed:
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/ZODBGroupManager.py

-=-
Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2009-03-03 15:09:53 UTC (rev 97440)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2009-03-03 15:12:47 UTC (rev 97441)
@@ -4,6 +4,9 @@
 PluggableAuthService 1.7 (unreleased)
 -------------------------------------
 
+- Don't fail on users defined in multiple user sources on the ZODBGroupManager
+  listing page.
+
 - Fixed deprecation warnings for use of Globals and avoid deprecation
   warnings for the md5 and sha modules.
 

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/ZODBGroupManager.py	2009-03-03 15:09:53 UTC (rev 97440)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/ZODBGroupManager.py	2009-03-03 15:12:47 UTC (rev 97441)
@@ -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 ) )