Bhargav has proposed merging lp:~bhargav-golla/postorius/bug-1294463 into
lp:postorius.
Commit message:
Fix Bug 1294463
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~bhargav-golla/postorius/bug-1294463/+merge/212167
This merge fixes Bug 1294463.
--
https://code.launchpad.net/~bhargav-golla/postorius/bug-1294463/+merge/212167
Your team Mailman Coders is requested to review the proposed merge of
lp:~bhargav-golla/postorius/bug-1294463 into lp:postorius.
=== modified file 'src/postorius/templates/postorius/lists/summary.html'
--- src/postorius/templates/postorius/lists/summary.html 2013-05-31 02:21:03 +0000
+++ src/postorius/templates/postorius/lists/summary.html 2014-03-21 14:26:05 +0000
@@ -15,13 +15,16 @@
<h2>{% trans 'Description' %}</h2>
<p>{{list.settings.description }}</p>
+ {% if user.is_authenticated %}
+ {% if userSubscribed %}
+ <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
+ {% else %}
<h2>{% trans 'Subscribe to this list' %}</h2>
- {% if user.is_authenticated %}
<form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
{{subscribe_form.as_p}}
<input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" />
- <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
</form>
+ {% endif %}
{% else %}
<p>To subscribe or unsubscribe this list you have to be logged in.</p>
<p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
=== modified file 'src/postorius/views/list.py'
--- src/postorius/views/list.py 2014-03-15 21:36:39 +0000
+++ src/postorius/views/list.py 2014-03-21 14:26:05 +0000
@@ -117,10 +117,18 @@
def get(self, request, fqdn_listname):
user_email = getattr(request.user, 'email', None)
+ userSubscribed = False
+ try:
+ userMember = self.mailing_list.get_member(user_email)
+ except ValueError:
+ pass
+ else:
+ userSubscribed = True
return render_to_response(
'postorius/lists/summary.html',
{'list': self.mailing_list,
- 'subscribe_form': ListSubscribe(initial={'email': user_email})},
+ 'subscribe_form': ListSubscribe(initial={'email': user_email}),
+ 'userSubscribed': userSubscribed},
context_instance=RequestContext(request))
_______________________________________________
Mailman-coders mailing list
[email protected]
https://mail.python.org/mailman/listinfo/mailman-coders
