Merge lp:~jimmy-sigint/mailman/restapi_additional_attributes into lp:mailman

[Jimmy Bergman]

[Barry Warsaw (barry)]

Thanks for the great contribution. It took me a while to merge it because I realized that some of the things this branch touched had not been fully fleshed out. Now, member moderation should be functional but non-member moderation still needs some work. But your branch was great, and it is now merged!

review: Approve

=== modified file 'src/mailman/rest/configuration.py'
--- src/mailman/rest/configuration.py	2010-09-01 14:39:36 +0000
+++ src/mailman/rest/configuration.py	2010-10-14 07:31:44 +0000
@@ -29,8 +29,10 @@
 from restish import http, resource
 
 from mailman.config import config
+from mailman.interfaces.action import Action
 from mailman.interfaces.autorespond import ResponseAction
 from mailman.interfaces.mailinglist import IAcceptableAliasSet
+from mailman.interfaces.mailinglist import ReplyToMunging
 from mailman.rest.helpers import PATCH, etag
 from mailman.rest.validator import Validator, enum_validator
 
@@ -173,11 +175,13 @@
     collapse_alternatives=GetterSetter(as_boolean),
     convert_html_to_plaintext=GetterSetter(as_boolean),
     created_at=GetterSetter(None),
+    default_member_moderation=GetterSetter(as_boolean),
     description=GetterSetter(unicode),
     digest_last_sent_at=GetterSetter(None),
     digest_size_threshold=GetterSetter(float),
     filter_content=GetterSetter(as_boolean),
     fqdn_listname=GetterSetter(None),
+    generic_nonmember_action=GetterSetter(int),
     host_name=GetterSetter(None),
     include_list_post_header=GetterSetter(as_boolean),
     include_rfc2369_headers=GetterSetter(as_boolean),
@@ -186,6 +190,7 @@
     leave_address=GetterSetter(None),
     list_id=GetterSetter(None),
     list_name=GetterSetter(None),
+    member_moderation_action=GetterSetter(enum_validator(Action)),
     next_digest_number=GetterSetter(None),
     no_reply_address=GetterSetter(None),
     owner_address=GetterSetter(None),
@@ -193,10 +198,13 @@
     post_id=GetterSetter(None),
     posting_address=GetterSetter(None),
     real_name=GetterSetter(unicode),
+    reply_goes_to_list=GetterSetter(enum_validator(ReplyToMunging)),
     request_address=GetterSetter(None),
     scheme=GetterSetter(None),
+    send_welcome_msg=GetterSetter(as_boolean),
     volume=GetterSetter(None),
     web_host=GetterSetter(None),
+    welcome_msg=GetterSetter(unicode),
     )
 
 
 
=== modified file 'src/mailman/rest/docs/configuration.txt'
--- src/mailman/rest/docs/configuration.txt	2010-09-15 15:37:54 +0000
+++ src/mailman/rest/docs/configuration.txt	2010-10-14 07:31:44 +0000
@@ -32,11 +32,13 @@
     collapse_alternatives: True
     convert_html_to_plaintext: False
     created_at: 20...T...
+    default_member_moderation: False
     description:
     digest_last_sent_at: None
     digest_size_threshold: 30.0
     filter_content: False
     fqdn_listname: [e-mail]
+    generic_nonmember_action: 1
     host_name: example.com
     http_etag: "..."
     include_list_post_header: True
@@ -46,6 +48,7 @@
     leave_address: [e-mail]
     list_id: test-one.example.com
     list_name: test-one
+    member_moderation_action: hold
     next_digest_number: 1
     no_reply_address: [e-mail]
     owner_address: [e-mail]
@@ -53,10 +56,13 @@
     post_id: 1
     posting_address: [e-mail]
     real_name: Test-one
+    reply_goes_to_list: no_munging
     request_address: [e-mail]
     scheme: http
+    send_welcome_msg: True
     volume: 1
     web_host: lists.example.com
+    welcome_msg:
 
 
 Changing the full configuration
@@ -91,6 +97,12 @@
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
+    ...             reply_goes_to_list='point_to_list',
+    ...             send_welcome_msg=True,
+    ...             welcome_msg='welcome message',
+    ...             member_moderation_action='reject',
+    ...             default_member_moderation=True,
+    ...             generic_nonmember_action=2,
     ...             ),
     ...           'PUT')
     content-length: 0
@@ -119,6 +131,7 @@
     collapse_alternatives: False
     convert_html_to_plaintext: True
     ...
+    default_member_moderation: True
     description: This is my mailing list
     ...
     digest_size_threshold: 10.5
@@ -130,7 +143,9 @@
     pipeline: virgin
     ...
     real_name: Fnords
+    reply_goes_to_list: point_to_list
     ...
+    welcome_msg: welcome message
 
 If you use ``PUT`` to change a list's configuration, all writable attributes
 must be included.  It is an error to leave one or more out...
@@ -160,6 +175,12 @@
     ...             filter_content=True,
     ...             convert_html_to_plaintext=True,
     ...             collapse_alternatives=False,
+    ...             reply_goes_to_list='point_to_list',
+    ...             send_welcome_msg=True,
+    ...             welcome_msg='welcome message',
+    ...             member_moderation_action='reject',
+    ...             default_member_moderation=True,
+    ...             generic_nonmember_action=2,
     ...             ),
     ...           'PUT')
     Traceback (most recent call last):