diff --git a/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html index 3ca19cd..82fc48e 100644 --- a/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html +++ b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html @@ -3,20 +3,49 @@ {% block main %} {% include 'mailmanweb/menu/user_nav.html' %} -

{{ user }}'s Profile

+

{{ user }}'s List Settings

Mailman display name: {{ mm_user.real_name}}

Django email: {{ user.email }}

Mailman primary email: {{ mm_user.email }}

-

Mailman display name: {{ mm_user.real_name}}

-

Valid addresses with this account:

+

Valid email addresses for this account:

+

List memberships:

+ + + +

Prefs form

+ {{ settingsform.asp }} +

List Preferences Overview

+
- +
@@ -26,7 +55,7 @@ - + + {% for preference in mm_user.preferences %} + {% endfor %} diff --git a/src/mailmanweb/views.py b/src/mailmanweb/views.py index 80cdb5e..afe72fc 100644 --- a/src/mailmanweb/views.py +++ b/src/mailmanweb/views.py @@ -432,7 +432,15 @@ @login_required def user_mailmansettings(request): + try: + the_user = MailmanUser.objects.get(address=request.user.email) + except MailmanApiError: + return utils.render_api_error(request) + + settingsform = MembershipSettings() return render_to_response('mailmanweb/user_mailmansettings.html', + {'mm_user': the_user, + 'settingsform': settingsform}, context_instance=RequestContext(request)) @login_required def user_settings(request, tab = "membership",
{% trans "Setting" %} {% trans "Description" %}starfruit@example.com
{% trans "Mail delivery" %}{% trans "Mail delivery" %} ({{ preference }}) Set this option to Enabled to receive messages posted to this mailing list. Set it to Disabled if you want @@ -39,6 +68,8 @@
{% trans "Per-Email subscriptions" %}