Merge lp:~danci-emanuel/mailman/dlists_support_added into lp:~danci-emanuel/mailman/mm_orig

[Emanuel Danci]

[Robin J (robin-jeffries)]

This all looks reasonable, but I don't have the larger context of what these files are actually doing.

At line 114, why did you delete mlist.advertised?

It also looks like you are arbitrarily changing the indentation at lines 44 and 82. That's not good.

With those changes, it's probably OK for now. (you need a larger context to be able to test it, I think -- like something that uses the dlists_enabled variable?

review: Approve

[Emanuel Danci (danci-emanuel)]

> This all looks reasonable, but I don't have the larger context of what these
> files are actually doing.
>
> At line 114, why did you delete mlist.advertised?
>
> It also looks like you are arbitrarily changing the indentation at lines 44
> and 82. That's not good.
>
> With those changes, it's probably OK for now. (you need a larger context to be
> able to test it, I think -- like something that uses the dlists_enabled
> variable?

Indeed, I deleted mlist.advertised while doing some testing and I missed adding it back. Thanks for outlining this!
As for the indentation, I changed it while adding some code in those parts, but although I changed it back to the original form, it seems that the commit did not take into considerations those changes. In those parts, the code looks like in the original files now.

Unmerged revisions

7160. By Emanuel Danci on 2012-07-10

Contains the changes needed for supporting Dynamic sublists

7159. By Emanuel Danci on 2012-07-10

Contains the changes needed for supporting Dynamic sublists

7158. By Emanuel Danci on 2012-07-10

Dynamic sublists support added

7157. By Emanuel Danci on 2012-07-09

Contains the changes needed for supporting Dynamic sublists

7156. By Emanuel Danci on 2012-07-09

contains UI changes needed for supporing Dynamic sublists

=== modified file 'src/mailman/database/schema/postgres.sql'
--- src/mailman/database/schema/postgres.sql	2012-03-23 02:38:49 +0000
+++ src/mailman/database/schema/postgres.sql	2012-07-10 11:11:19 +0000
@@ -19,6 +19,7 @@
     admin_notify_mchanges BOOLEAN,
     administrivia BOOLEAN,
     advertised BOOLEAN,
+    dlists_enabled BOOLEAN,
     anonymous_list BOOLEAN,
     archive BOOLEAN,
     archive_private BOOLEAN,
 
=== modified file 'src/mailman/database/schema/sqlite.sql'
--- src/mailman/database/schema/sqlite.sql	2012-03-23 02:38:49 +0000
+++ src/mailman/database/schema/sqlite.sql	2012-07-10 11:11:19 +0000
@@ -115,6 +115,7 @@
     admin_notify_mchanges BOOLEAN,
     administrivia BOOLEAN,
     advertised BOOLEAN,
+    dlists_enabled BOOLEAN,
     anonymous_list BOOLEAN,
     archive BOOLEAN,
     archive_private BOOLEAN,
 
=== modified file 'src/mailman/interfaces/mailinglist.py'
--- src/mailman/interfaces/mailinglist.py	2012-03-23 02:38:49 +0000
+++ src/mailman/interfaces/mailinglist.py	2012-07-10 11:11:19 +0000
@@ -123,6 +123,9 @@
         """Advertise this mailing list when people ask for an overview of the
         available mailing lists.""")
 
+    dlists_enabled = Attribute(
+	    """Is the Dynamic sublists feature enabled for this list?""")
+	
     # Contact addresses
 
     posting_address = Attribute(
@@ -196,8 +199,8 @@
     administrators = Attribute(
         """The IUser administrators of this mailing list.
 
-        This includes the IUsers who are both owners and moderators of the
-        mailing list.""")
+		This includes the IUsers who are both owners and moderators of the
+		mailing list.""")
 
     members = Attribute(
         """An iterator over all the members of the mailing list, regardless of
 
=== modified file 'src/mailman/model/mailinglist.py'
--- src/mailman/model/mailinglist.py	2012-04-26 02:08:22 +0000
+++ src/mailman/model/mailinglist.py	2012-07-10 11:11:19 +0000
@@ -82,6 +82,7 @@
     include_list_post_header = Bool()
     include_rfc2369_headers = Bool()
     advertised = Bool()
+    dlists_enabled = Bool()
     anonymous_list = Bool()
     # Attributes not directly modifiable via the web u/i
     created_at = DateTime()
 
=== modified file 'src/mailman/rest/configuration.py'
--- src/mailman/rest/configuration.py	2012-03-15 22:48:41 +0000
+++ src/mailman/rest/configuration.py	2012-07-10 11:11:19 +0000
@@ -162,6 +162,7 @@
     admin_notify_mchanges=GetterSetter(as_boolean),
     administrivia=GetterSetter(as_boolean),
     advertised=GetterSetter(as_boolean),
+    dlists_enabled = GetterSetter(as_boolean),
     anonymous_list=GetterSetter(as_boolean),
     autorespond_owner=GetterSetter(enum_validator(ResponseAction)),
     autorespond_postings=GetterSetter(enum_validator(ResponseAction)),
@@ -205,11 +206,10 @@
     welcome_message_uri=GetterSetter(unicode),
     )
 
-
 VALIDATORS = ATTRIBUTES.copy()
 for attribute, gettersetter in VALIDATORS.items():
     if gettersetter.decoder is None:
-        del VALIDATORS[attribute]
+   		del VALIDATORS[attribute]
 
 
 
 
@@ -233,7 +233,7 @@
             return http.bad_request(
                 [], b'Unknown attribute: {0}'.format(self._attribute))
         else:
-            attribute = self._attribute
+            attribute = self._attribute       
             value = ATTRIBUTES[attribute].get(self._mlist, attribute)
             resource[attribute] = value
         return http.ok([], etag(resource))
 
=== modified file 'src/mailman/styles/default.py'
--- src/mailman/styles/default.py	2012-05-10 03:36:59 +0000
+++ src/mailman/styles/default.py	2012-07-10 11:11:19 +0000
@@ -24,12 +24,9 @@
     'DefaultStyle',
     ]
 
-
 # XXX Styles need to be reconciled with lazr.config.
-
 from datetime import timedelta
 from zope.interface import implementer
-
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action, FilterAction
 from mailman.interfaces.bounce import UnrecognizedBounceDisposition
@@ -62,7 +59,7 @@
         mlist.post_id = 1
         mlist.new_member_options = 256
         mlist.respond_to_post_requests = True
-        mlist.advertised = True
+        mlist.dlists_enabled = False 
         mlist.max_num_recipients = 10
         mlist.max_message_size = 40 # KB
         mlist.reply_goes_to_list = ReplyToMunging.no_munging