Merge lp:~danci-emanuel/postorius/UI_dlists_support into lp:~danci-emanuel/postorius/postorius_orig

Proposed by Emanuel Danci
Status: Needs review
Proposed branch: lp:~danci-emanuel/postorius/UI_dlists_support
Merge into: lp:~danci-emanuel/postorius/postorius_orig
Diff against target: 77 lines (+25/-3)
2 files modified
src/postorius/forms.py (+24/-2)
src/postorius/views.py (+1/-1)
To merge this branch: bzr merge lp:~danci-emanuel/postorius/UI_dlists_support
Reviewer Review Type Date Requested Status
Terri (community) Disapprove
Robin J Pending
Emanuel Danci Pending
Review via email: mp+114174@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robin J (robin-jeffries) wrote :

Again, I haven't seen these files before, so I'm a bit in the dark, but the changes are simple, and they look sensible.

At line 43, I think that your message should be different -- based on the other example, the format seems to be a question. How about: Allow list members to (un)subscribe to individual threads?

Also change line ll to say: Enable individual thread subscribe/unsubscribe for this list?

I'm betting that line 74 is more than 80 chars long, and you should break it -- see how it is done at line 72?

It looks good, but I'll leave this as a comment, in case someone else wants to chime in.

Revision history for this message
Emanuel Danci (danci-emanuel) wrote :

> Again, I haven't seen these files before, so I'm a bit in the dark, but the
> changes are simple, and they look sensible.
>
> At line 43, I think that your message should be different -- based on the
> other example, the format seems to be a question. How about: Allow list
> members to (un)subscribe to individual threads?
>
> Also change line ll to say: Enable individual thread subscribe/unsubscribe for
> this list?
>
> I'm betting that line 74 is more than 80 chars long, and you should break it
> -- see how it is done at line 72?
>
> It looks good, but I'll leave this as a comment, in case someone else wants to
> chime in.

I changed the text and I also took care of the line 74. Do you think I should change anything else
to these files before I push the changed code?

Thank you,
Emanuel

Revision history for this message
Terri (terriko) wrote :

I'm clearing up some of the old merge requests to make sure their statuses are correct, and I'm marking this one as disapprove since the associated mailman core code never happened.

review: Disapprove

Unmerged revisions

71. By Emanuel Danci

Contains the UI changes needed for enabling/disabling Dynamic sublists.

70. By Emanuel Danci

Contains the UI changes needed for enabling/disabling Dynamic sublists.

69. By Emanuel Danci

Contains the UI changes needed for enabling/disabling Dynamic sublists.

68. By Emanuel Danci

Contains the UI changes needed for enabling/disabling Dynamic sublists.

67. By Emanuel Danci

Contains the UI changes needed for supporing Dynamic sublists

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py 2012-03-23 23:22:16 +0000
+++ src/postorius/forms.py 2012-07-10 12:02:18 +0000
@@ -96,6 +96,19 @@
96 'required': _("Please enter the list owner's email address."), 96 'required': _("Please enter the list owner's email address."),
97 },97 },
98 required = True)98 required = True)
99
100 dlists_enabled = forms.ChoiceField(
101 widget = forms.RadioSelect(),
102 label = _("Enable Dynamic sublists feature for this list?"),
103 error_messages = {
104 'required': _("Please choose an option."),
105 },
106 required = True,
107 choices = (
108 (True, _("Enable.")),
109 (False, _("Do not enable."))
110 ))
111
99 advertised = forms.ChoiceField(112 advertised = forms.ChoiceField(
100 widget = forms.RadioSelect(),113 widget = forms.RadioSelect(),
101 label = _('Advertise this list?'), 114 label = _('Advertise this list?'),
@@ -142,7 +155,8 @@
142 "mail_host",155 "mail_host",
143 "list_owner",156 "list_owner",
144 "description",157 "description",
145 "advertised"],]158 "advertised",
159 "dlists_enabled"],]
146160
147class ListSubscribe(FieldsetForm):161class ListSubscribe(FieldsetForm):
148 """Form fields to join an existing list.162 """Form fields to join an existing list.
@@ -302,6 +316,13 @@
302 widget = forms.RadioSelect,316 widget = forms.RadioSelect,
303 label = _('Advertise the existance of this list?'), 317 label = _('Advertise the existance of this list?'),
304 )318 )
319
320 dlists_enabled = forms.TypedChoiceField(
321 coerce=lambda x: x =='True',
322 choices=((True, _('Enabled')), (False, _('Disabled'))),
323 widget = forms.RadioSelect,
324 label = _("Status of the Dynamic sublists feature"),
325 )
305 filter_content = forms.TypedChoiceField(326 filter_content = forms.TypedChoiceField(
306 coerce=lambda x: x =='True',327 coerce=lambda x: x =='True',
307 choices=((True, _('Yes')), (False, _('No'))),328 choices=((True, _('Yes')), (False, _('No'))),
@@ -780,7 +801,8 @@
780 # just a really temporary layout to see that it works. -- Anna801 # just a really temporary layout to see that it works. -- Anna
781 layout = [802 layout = [
782 ["List Identity", "display_name", "mail_host", "description", 803 ["List Identity", "display_name", "mail_host", "description",
783 "advertised"], 804 "advertised",
805 "dlists_enabled"],
784 #"info", "list_name", "host_name", "list_id", "fqdn_listname", 806 #"info", "list_name", "host_name", "list_id", "fqdn_listname",
785 #"http_etag", "volume", "web_host"807 #"http_etag", "volume", "web_host"
786 ["Automatic Responses", "autorespond_owner",808 ["Automatic Responses", "autorespond_owner",
787809
=== modified file 'src/postorius/views.py'
--- src/postorius/views.py 2012-05-25 22:37:22 +0000
+++ src/postorius/views.py 2012-07-10 12:02:18 +0000
@@ -45,7 +45,6 @@
4545
46logger = logging.getLogger(__name__)46logger = logging.getLogger(__name__)
4747
48
49@login_required48@login_required
50@user_passes_test(lambda u: u.is_superuser)49@user_passes_test(lambda u: u.is_superuser)
51def site_settings(request):50def site_settings(request):
@@ -123,6 +122,7 @@
123 list_settings["description"] = form.cleaned_data['description']122 list_settings["description"] = form.cleaned_data['description']
124 list_settings["owner_address"] = \123 list_settings["owner_address"] = \
125 form.cleaned_data['list_owner']124 form.cleaned_data['list_owner']
125 list_settings["dlists_enabled"] = form.cleaned_data['dlists_enabled']
126 list_settings["advertised"] = form.cleaned_data['advertised']126 list_settings["advertised"] = form.cleaned_data['advertised']
127 list_settings.save()127 list_settings.save()
128 messages.success(request, _("List created"))128 messages.success(request, _("List created"))

Subscribers

People subscribed via source and target branches

to all changes: