Log message for revision 77297:
Merged trunk r77296 into 2.10 branch.
Collector #1306: Missing acquisition context on local roles screen.
Changed:
U Zope/branches/2.10/doc/CHANGES.txt
U Zope/branches/2.10/lib/python/AccessControl/Role.py
-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt 2007-07-02 10:12:03 UTC (rev 77296)
+++ Zope/branches/2.10/doc/CHANGES.txt 2007-07-02 10:14:18 UTC (rev 77297)
@@ -8,6 +8,8 @@
Bugs fixed
+ - Collector #1306: Missing acquisition context on local roles screen.
+
- Collector #2153: Supporting unquoted cookies with spaces.
- The REQUEST no longer accepts holds after it has been closed.
Modified: Zope/branches/2.10/lib/python/AccessControl/Role.py
===================================================================
--- Zope/branches/2.10/lib/python/AccessControl/Role.py 2007-07-02 10:12:03 UTC
(rev 77296)
+++ Zope/branches/2.10/lib/python/AccessControl/Role.py 2007-07-02 10:14:18 UTC
(rev 77297)
@@ -345,11 +345,12 @@
if mlu < 0: raise OverflowError
un = getattr(aclu, 'user_names', _notfound)
if un is not _notfound:
+ un = aclu.__of__(item).user_names # rewrap
unl = un()
# maxlistusers of 0 is list all
if len(unl) > mlu and mlu != 0:
raise OverflowError
- for name in un():
+ for name in unl:
dict[name]=1
item = getattr(item, 'aq_parent', _notfound)
if item is _notfound:
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
