From 9d25bddb18f6bee573e3077c9429394d6bc609cf Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Tue, 4 Oct 2011 14:53:13 -0700 Subject: - Mailman/Gui/General.py Fixed the setting of new_member_options so that unprocessed bits are not changed. Augmented the logic so that bin/config_list can set or reset any bits in mm_cfg.OPTINFO. Bug #865825. - Mailman/Defaulys.py.in Added missing bits to OPTINFO. --- Mailman/Gui/General.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'Mailman/Gui') diff --git a/Mailman/Gui/General.py b/Mailman/Gui/General.py index b398bc92..e9f8f9b5 100644 --- a/Mailman/Gui/General.py +++ b/Mailman/Gui/General.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2011 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -25,6 +25,7 @@ from Mailman import mm_cfg from Mailman import Utils from Mailman import Errors from Mailman.i18n import _ +from Mailman.htmlformat import Document from Mailman.Gui.GUIBase import GUIBase OPTIONS = ('hide', 'ack', 'notmetoo', 'nodupes') @@ -455,11 +456,22 @@ class General(GUIBase): changed! It must differ from the list's name by case only.""")) elif property == 'new_member_options': - newopts = 0 - for opt in OPTIONS: + # Get current value because there are valid bits not in OPTIONS. + # If we're the admin CGI, we then process the bits in OPTIONS, + # turning them on or off as appropriate. Otherwise we process all + # the bits in mm_cfg.OPTINFO so that config_list can set and reset + # them. + newopts = mlist.new_member_options + if isinstance(doc, Document): + opts = OPTIONS + else: + opts = mm_cfg.OPTINFO + for opt in opts: bitfield = mm_cfg.OPTINFO[opt] if opt in val: newopts |= bitfield + else: + newopts &= ~bitfield mlist.new_member_options = newopts elif property == 'subject_prefix': # Convert any html entities to Unicode -- cgit v1.2.3