Merge authors:
Jim Popovitch (jimpop)
------------------------------------------------------------
revno: 1679 [merge]
fixes bug: https://launchpad.net/bugs/1637061
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Wed 2016-10-26 21:43:16 -0700
message:
Fixed incorrect "view more members" links at the bottom of the admin
Membership List pages.
modified:
Mailman/Cgi/admin.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Cgi/admin.py'
--- Mailman/Cgi/admin.py 2016-09-29 19:10:08 +0000
+++ Mailman/Cgi/admin.py 2016-10-27 04:43:16 +0000
@@ -1188,11 +1188,12 @@
continue
start = chunkmembers[i*chunksz]
end = chunkmembers[min((i+1)*chunksz, last)-1]
- url = url + 'chunk=%d' % i + findfrag
- if isinstance(url, unicode):
- url = url.encode(Utils.GetCharSet(mlist.preferred_language),
+ thisurl = url + 'chunk=%d' % i + findfrag
+ if isinstance(thisurl, unicode):
+ thisurl = thisurl.encode(
+ Utils.GetCharSet(mlist.preferred_language),
errors='ignore')
- link = Link(url, _('from %(start)s to %(end)s'))
+ link = Link(thisurl, _('from %(start)s to %(end)s'))
buttons.append(link)
buttons = UnorderedList(*buttons)
container.AddItem(footer + buttons.Format() + '<p>')
=== modified file 'NEWS'
--- NEWS 2016-10-11 20:28:51 +0000
+++ NEWS 2016-10-27 04:43:16 +0000
@@ -23,6 +23,9 @@
Bug fixes and other patches
+ - Fixed a bug which created incorrect "view more members" links at the
+ bottom of the admin Membership List pages. (LP: #1637061)
+
- The 2.1.23 fix for LP: #1604544 only fixed the letter links at the top
of the Membership List. The links at the bottom have now been fixed.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
