Merge lp:~sophron/postorius/create_users into lp:postorius

[George Chatzisofroniou]

I worked on this bug: https://bugs.launchpad.net/postorius/+bug/1058445

I added the feature to create a mailman user account, but in order to edit the basic user data via the web interface, some additions to mailman client are required. See, https://bugs.launchpad.net/mailman.client/+bug/1066352 and https://bugs.launchpad.net/mailman.client/+bug/1066343.

We also need an icon for the new entry on the menu: https://bugs.launchpad.net/postorius/+bug/1066340

I think it's better to divide the whole 'edit user' feature into smaller ones (delete user, register addresses to a user, basic data edit, etc).

[lp:~sophron/postorius/create_users]

92. By George Chatzisofroniou on 2012-10-13

Added the required templates for users

[Florian Fuchs (flo-fuchs)]

Hi George,

thank you for your changes (and the bug reports)! I have just merged them to the trunk. I only made some very small changes and additions (adjusted the docstring in MailmanUserView, added the user icon, some PEP8 fixes...). I also made the user list and details only available to superusers (I don't think every user should be able to see who else is there...).

So now that we have a method to add new users to the core, we need a way to connect them to the users in the postorius database (the ones added through django.contrib.auth). I added some comment about that in the bug description:

https://bugs.launchpad.net/postorius/+bug/1058445

Cheers and thanks again
Florian

review: Approve

[Richard Wackerbarth (wacky)]

Isn't the visibility of the list members a per_list policy setting?

In any case, we will need to have list administrators (who are not the superuser) be able to see the membership on their list.

I think that Postorius will require a better model for roles.

Richard

On Oct 25, 2012, at 3:19 AM, Florian Fuchs <email address hidden> wrote:

> Review: Approve
>
> Hi George,
>
> thank you for your changes (and the bug reports)! I have just merged them to the trunk. I only made some very small changes and additions (adjusted the docstring in MailmanUserView, added the user icon, some PEP8 fixes...). I also made the user list and details only available to superusers (I don't think every user should be able to see who else is there...).

[Florian Fuchs (flo-fuchs)]

Hi Richard,

2012/10/25 Richard Wackerbarth <email address hidden>:
> Isn't the visibility of the list members a per_list policy setting?

Please not that users/index is not a list of members, but a list of
the users stored in Mailman's core database. The members of a list are
displayed for each list separately and can be accessed only by
superusers and list owners.

> In any case, we will need to have list administrators (who are not the superuser) be able to see the membership on their list.
>
> I think that Postorius will require a better model for roles.

Yes, this is already possible. There are two custom permission
decorators for view functions (list_owner_required and
list_moderator_required) that check if the currently logged-in user is
either the owner or the moderator of a list. Currently those
restrictions are in user on the list members page, the moderation
page, the list settings etc.

Next step is providing forms to make existing users owners and/or moderators.

Cheers
Florian

=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py	2012-09-23 02:35:28 +0000
+++ src/postorius/forms.py	2012-10-13 18:25:24 +0000
@@ -534,6 +534,41 @@
                    "delivery_mode", "delivery_status"]]
 
 
+class UserNew(FieldsetForm):
+    """
+    Form field to add a new user
+    """
+    display_name = forms.CharField(
+        label=_('User Name'),
+        required=True,
+        error_messages={'required': _('Please enter a display name.'),
+                        'invalid': _('Please enter a valid display name.')})
+    email = forms.EmailField(
+        label=_("User's email address"),
+        error_messages={
+            'required': _("Please enter the user's email address.")},
+        required=True)
+    password = forms.CharField(
+        label=_('Password'),
+        required=True,
+        error_messages={'required': _('Please enter a password.')},
+        widget=forms.PasswordInput(render_value=False))
+    password_repeat = forms.CharField(
+        label=_('Repeat password'),
+        required=True,
+        error_messages={'required': _('Please repeat the password.')},
+        widget=forms.PasswordInput(render_value=False))
+
+    def clean(self):
+        cleaned_data = self.cleaned_data 
+        password = cleaned_data.get("password")
+        password_repeat = cleaned_data.get("password_repeat")
+        if password != password_repeat:
+            raise forms.ValidationError("Passwords must be identical.")
+
+        return cleaned_data
+
+
 class UserSettings(FieldsetForm):
     """Form handling the user settings.
     """
 
=== modified file 'src/postorius/templates/postorius/base.html'
--- src/postorius/templates/postorius/base.html	2012-08-29 15:03:37 +0000
+++ src/postorius/templates/postorius/base.html	2012-10-13 18:25:24 +0000
@@ -24,6 +24,7 @@
                 <ul class="mm_metaNav">
                     <li><a class="mm_lists" href="{% url list_index %}">Lists</a></li>
                     {% if user.is_authenticated %}
+                    <li><a class="mm_users" href="{% url user_index %}">Users</a></li>
                     <li><a class="mm_todos" href="{% url user_todos %}">Todos</a></li>
                     {% endif %}
                     {% if user.is_superuser %}
 
=== added file 'src/postorius/templates/postorius/menu/mm_user_nav.html'
--- src/postorius/templates/postorius/menu/mm_user_nav.html	1970-01-01 00:00:00 +0000
+++ src/postorius/templates/postorius/menu/mm_user_nav.html	2012-10-13 18:25:24 +0000
@@ -0,0 +1,8 @@
+{% load i18n %}
+<div class="mm_subHeader">
+    <span class="mm_context">{{ mm_user.address }}</span>
+    <ul class="mm_nav">
+        <li class="mm_user_summary"><a href="{% url user_summary mm_user.user_id %}">{% trans "Info" %}</a></li>
+        <li class="mm_new_user"><a class="btn btn-mini btn-success" href="{% url user_new %}">{% trans "New User" %}</a></li>
+    </ul>
+</div>
 
=== added directory 'src/postorius/templates/postorius/users'
=== added file 'src/postorius/templates/postorius/users/index.html'
--- src/postorius/templates/postorius/users/index.html	1970-01-01 00:00:00 +0000
+++ src/postorius/templates/postorius/users/index.html	2012-10-13 18:25:24 +0000
@@ -0,0 +1,32 @@
+{% extends "postorius/base.html" %}
+{% load i18n %}
+
+{% block main %}
+    {% if user.is_superuser %}
+        <ul class="mm_nav">
+            <li class="mm_new_user"><a class="btn btn-mini btn-success" href="{% url user_new %}">{% trans "New User" %}</a></li>
+        </ul>
+    {% endif %}
+    <h1>{% trans 'Users' %}</h1>
+
+    <table class="table table-bordered table-striped">
+    	<thead>
+    		<tr>
+    			<th>{% trans 'Email' %}</th>
+    			<th>{% trans 'Display name' %}</th>
+    		</tr>
+    	</thead>
+    	<tbody>
+            {% for mm_user in mm_users %}
+    		<tr>
+    			<td>
+                    <a href="{% url user_summary user_id=mm_user.user_id %}">{% for address in mm_user.addresses|slice:":1" %}{{ address }}{% endfor %}</a>
+                </td>
+    			<td>
+                {{ mm_user.display_name }}
+                </td>
+    		</tr>
+            {% endfor %}
+    	</tbody>
+    </table>
+{% endblock main %}
 
=== added file 'src/postorius/templates/postorius/users/new.html'
--- src/postorius/templates/postorius/users/new.html	1970-01-01 00:00:00 +0000
+++ src/postorius/templates/postorius/users/new.html	2012-10-13 18:25:24 +0000
@@ -0,0 +1,12 @@
+{% extends extend_template %}
+{% load i18n %}    
+
+{% block main %}
+    <h1>{% trans "Add a new User" %}</h1>
+    <form action="{% url user_new %}" method="post" class="well"> {% csrf_token %}
+        {{ form.as_p }}
+        <div class="field">
+            <button class="btn btn-success" type="submit">{% trans "Create User" %}</button>
+        </div>
+    </form>
+{% endblock main %}
 
=== added file 'src/postorius/templates/postorius/users/summary.html'
--- src/postorius/templates/postorius/users/summary.html	1970-01-01 00:00:00 +0000
+++ src/postorius/templates/postorius/users/summary.html	2012-10-13 18:25:24 +0000
@@ -0,0 +1,17 @@
+{% extends extend_template %}
+{% load i18n %}
+
+{% block main %}
+    {% include 'postorius/menu/mm_user_nav.html' %}
+    <h1>{% trans 'Mailman User' %}</h1>
+
+    <p><strong>Display name:</strong> {{ mm_user.display_name}}</p>
+
+    <h2>Valid email addresses for this account:</h2>
+    <ul>
+    {% for address in mm_user.addresses %}
+        <li>{{ address }}</li>
+    {% endfor %}
+    </ul>
+
+{% endblock main %}
 
=== modified file 'src/postorius/urls.py'
--- src/postorius/urls.py	2012-09-23 12:10:25 +0000
+++ src/postorius/urls.py	2012-10-13 18:25:24 +0000
@@ -26,7 +26,7 @@
 
 urlpatterns = patterns(
     'postorius.views',
-    (r'^$', 'list_index'),
+    (r'^$', 'list_index'), 
     # /account/
     url(r'^accounts/login/$', 'user_login', name='user_login'),
     url(r'^accounts/logout/$', 'user_logout', name='user_logout'),
@@ -76,4 +76,9 @@
     url(r'^lists/(?P<fqdn_listname>[^/]+)/settings/(?P<visible_section>[^/]+)?'
         '(?:/(?P<visible_option>.*))?$', 'list_settings',
         name='list_settings'),
+    # /users/
+    url(r'^users/$', 'user_index', name='user_index'), 
+    url(r'^users/new/$', 'user_new', name='user_new'),
+    url(r'^users/(?P<user_id>[^/]+)/$',
+        UserSummaryView.as_view(), name='user_summary'),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
=== modified file 'src/postorius/views/generic.py'
--- src/postorius/views/generic.py	2012-09-26 21:13:41 +0000
+++ src/postorius/views/generic.py	2012-10-13 18:25:24 +0000
@@ -47,3 +47,25 @@
         if 'template' in kwargs:
             self.template = kwargs['template']
         return super(MailingListView, self).dispatch(request, *args, **kwargs)
+
+class MailmanUserView(TemplateView):
+    """A generic view for everything based on a mailman.client
+    list object.
+
+    Sets self.mailing_list to list object if fqdn_listname in **kwargs.
+    """
+
+    def _get_user(self, user_id):
+        return MailmanUser.objects.get_or_404(address=user_id)
+
+    def dispatch(self, request, *args, **kwargs):
+        # get the list object.
+        if 'user_id' in kwargs:
+            try:
+                self.mm_user = self._get_user(kwargs['user_id'])
+            except MailmanApiError:
+                return utils.render_api_error(request)
+        # set the template
+        if 'template' in kwargs:
+            self.template = kwargs['template']
+        return super(MailmanUserView, self).dispatch(request, *args, **kwargs)
 
=== modified file 'src/postorius/views/views.py'
--- src/postorius/views/views.py	2012-09-26 21:07:54 +0000
+++ src/postorius/views/views.py	2012-10-13 18:25:24 +0000
@@ -44,7 +44,7 @@
                               MailmanApiError, Mailman404Error)
 from postorius.forms import *
 from postorius.auth.decorators import list_owner_required
-from postorius.views.generic import MailingListView
+from postorius.views.generic import MailingListView, MailmanUserView
 
 
 logger = logging.getLogger(__name__)
@@ -697,6 +697,59 @@
                               context_instance=RequestContext(request))
 
 
+class UserSummaryView(MailmanUserView):
+    """Shows a summary of a user.
+    """
+
+    def get(self, request, user_id): 
+        settingsform = MembershipSettings()
+        return render_to_response('postorius/users/summary.html',
+                              {'mm_user': self.mm_user,
+                               'settingsform': settingsform},
+                              context_instance=RequestContext(request))
+
+
+@login_required
+def user_index(request, template='postorius/users/index.html'):
+    """Show a table of all users.
+    """
+    error = None
+    try:
+        mm_users = MailmanUser.objects.all()
+    except MailmanApiError:
+        return utils.render_api_error(request)
+    return render_to_response(template,
+                                  {'error': error,
+                                   'mm_users': mm_users},
+                                  context_instance=RequestContext(request))
+
+
+@login_required
+@user_passes_test(lambda u: u.is_superuser)
+def user_new(request):
+    message = None
+    if request.method == 'POST':
+        form = UserNew(request.POST)
+        if form.is_valid():
+            user = MailmanUser(display_name=form.cleaned_data['display_name'],
+                            email=form.cleaned_data['email'],
+                            password=form.cleaned_data['password'])
+            try:
+                user.save()
+            except MailmanApiError:
+                return utils.render_api_error(request)
+            except HTTPError, e:
+                messages.error(request, e)
+            else:
+                messages.success(request, _("New User registered"))
+            return redirect("user_index")
+    else:
+        form = UserNew()
+    return render_to_response('postorius/users/new.html',
+                              {'form': form, 'message': message},
+                              context_instance=RequestContext(request))
+
+
 def user_logout(request):
     logout(request)
     return redirect('user_login')