| Index: trunk/wmfmailadmin/wmfmailadmin.py |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | 'i': ('id', "Id", None, None), |
| 30 | 30 | 'q': ('quota', "Quota", 2**30/1024, None), |
| 31 | 31 | 'a': ('active', "Active", True, None), |
| 32 | | - 'f': ('filter', "Filter", None, "Filter file or '-' for stdin") |
| | 32 | + 'f': ('filter', "Filter", None, "Filter file or '-' for stdin, or 'None'") |
| 33 | 33 | } |
| 34 | 34 | longmappings = {} |
| 35 | 35 | |
| — | — | @@ -231,7 +231,11 @@ |
| 232 | 232 | |
| 233 | 233 | if not fields.has_key('filter') or fields['filter'] == "": return |
| 234 | 234 | |
| 235 | | - if fields['filter'] == '-': |
| | 235 | + if fields['filter'].lower() == 'none': |
| | 236 | + # Set to NULL in the db |
| | 237 | + fields['filter'] = None |
| | 238 | + return |
| | 239 | + elif fields['filter'] == '-': |
| 236 | 240 | filterfile = sys.stdin |
| 237 | 241 | else: |
| 238 | 242 | try: |