diff --git a/src/postorius/templates/postorius/lists/subscription_requests.html b/src/postorius/templates/postorius/lists/subscription_requests.html new file mode 100644 index 0000000..11a90c7 --- /dev/null +++ b/src/postorius/templates/postorius/lists/subscription_requests.html @@ -0,0 +1,55 @@ +{% extends postorius_base_template %} +{% load url from future %} +{% load i18n %} +{% load nav_helpers %} + +{% block body_class %}list_summary{% endblock %} + +{% block main %} + {% list_nav 'list_subscription_requests' "Subscription Requests" %} + + + + + + + + + + + + + {% for msg in list.held %} + + + + + + + + + {% endfor %} + +
{% trans 'Subject' %}{% trans 'Sender' %}{% trans 'Reason' %}{% trans 'Hold Date' %} 
{{ msg.subject }}{{ msg.sender }}{{ msg.reason }}{{ msg.hold_date }} + {% trans 'View' %} + + {% trans 'Accept' %} + {% trans 'Defer' %} + {% trans 'Reject' %} + {% trans 'Discard' %} + +
+ +{% endblock %} diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html index 4311652..132837c 100644 --- a/src/postorius/templates/postorius/menu/list_nav.html +++ b/src/postorius/templates/postorius/menu/list_nav.html @@ -10,6 +10,9 @@
  • {% trans "Members" %}
  • {% endif %} {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %} +
  • {% trans "Subscription Requests" %}
  • + {% endif %} + {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
  • {% trans "Held Messages" %}
  • {% endif %} {% if user.is_superuser or user.is_list_owner %} diff --git a/src/postorius/urls.py b/src/postorius/urls.py index 2dfde4d..fb15ef3 100644 --- a/src/postorius/urls.py +++ b/src/postorius/urls.py @@ -50,6 +50,9 @@ url(r'^subscriptions$', 'list_subscriptions', name='list_subscriptions'), + url(r'^subscription_requests$', + 'list_subscription_requests', + name='list_subscription_requests'), url(r'^mass_subscribe/$', ListMassSubscribeView.as_view( ), name='mass_subscribe'), diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index a22de29..739592c 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -549,6 +549,18 @@ return redirect('list_held_messages', the_list.list_id) +def list_subscription_requests(request, list_id): + """Shows a list of held messages. + """ + try: + m_list = utils.get_client().get_list(list_id) + except MailmanApiError: + return utils.render_api_error(request) + return render_to_response('postorius/lists/subscription_requests.html', + {'list': m_list}, + context_instance=RequestContext(request)) + + @list_owner_required def list_settings(request, list_id=None, visible_section=None, visible_option=None,