Refactor the user create, user delete and user set password views.

mayan/apps/user_management/apps.py

@@ -26,7 +26,12 @@ def get_groups():
 
 
 def get_users():
-    return ','.join([user.get_full_name() or user.username for user in get_user_model().objects.all()])
+    return ','.join(
+        [
+            user.get_full_name() or user.username
+            for user in get_user_model().objects.all()
+        ]
+    )
 
 
 class UserManagementApp(MayanAppConfig):

mayan/apps/user_management/forms.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from django import forms
 from django.contrib.auth import get_user_model
+from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -18,3 +19,11 @@ class PasswordForm(forms.Form):
     new_password_2 = forms.CharField(
         label=_('Confirm password'), widget=forms.PasswordInput()
     )
+
+    def clean(self):
+        password_1 = self.cleaned_data['new_password_1']
+        password_2 = self.cleaned_data['new_password_2']
+        if password_1 != password_2:
+            raise ValidationError('Passwords do not match.')
+
+        return self.cleaned_data

mayan/apps/user_management/links.py

@@ -59,11 +59,11 @@ link_user_multiple_delete = Link(
     view='user_management:user_multiple_delete'
 )
 link_user_multiple_set_password = Link(
-    permissions=(permission_user_edit,), text=_('Reset password'),
+    permissions=(permission_user_edit,), text=_('Set password'),
     view='user_management:user_multiple_set_password'
 )
 link_user_set_password = Link(
-    permissions=(permission_user_edit,), text=_('Reset password'),
+    permissions=(permission_user_edit,), text=_('Set password'),
     view='user_management:user_set_password', args='object.id'
 )
 link_user_setup = Link(

mayan/apps/user_management/urls.py

@@ -8,9 +8,8 @@ from .api_views import (
 )
 from .views import (
     GroupCreateView, GroupDeleteView, GroupEditView, GroupListView,
-    GroupMembersView, UserEditView, UserGroupsView, UserListView,
+    GroupMembersView, UserCreateView, UserDeleteView, UserEditView,
-    user_add, user_delete, user_multiple_delete, user_multiple_set_password,
+    UserGroupsView, UserListView, UserSetPasswordView
-    user_set_password
 )
 
 urlpatterns = [
@@ -30,19 +29,22 @@ urlpatterns = [
     ),
 
     url(r'^user/list/$', UserListView.as_view(), name='user_list'),
-    url(r'^user/add/$', user_add, name='user_add'),
+    url(r'^user/add/$', UserCreateView.as_view(), name='user_add'),
     url(r'^user/(?P<pk>\d+)/edit/$', UserEditView.as_view(), name='user_edit'),
-    url(r'^user/(?P<user_id>\d+)/delete/$', user_delete, name='user_delete'),
     url(
-        r'^user/multiple/delete/$', user_multiple_delete,
+        r'^user/(?P<pk>\d+)/delete/$', UserDeleteView.as_view(),
+        name='user_delete'
+    ),
+    url(
+        r'^user/multiple/delete/$', UserDeleteView.as_view(),
         name='user_multiple_delete'
     ),
     url(
-        r'^user/(?P<user_id>\d+)/set_password/$', user_set_password,
+        r'^user/(?P<pk>\d+)/set_password/$', UserSetPasswordView.as_view(),
         name='user_set_password'
     ),
     url(
-        r'^user/multiple/set_password/$', user_multiple_set_password,
+        r'^user/multiple/set_password/$', UserSetPasswordView.as_view(),
         name='user_multiple_set_password'
     ),
     url(

mayan/apps/user_management/views.py

@@ -1,21 +1,19 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render_to_response
+from django.shortcuts import get_object_or_404
-from django.template import RequestContext
+from django.utils.translation import ungettext, ugettext_lazy as _
-from django.utils.translation import ugettext_lazy as _
 
 from common.views import (
-    AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
+    AssignRemoveView, MultipleObjectConfirmActionView,
-    SingleObjectEditView, SingleObjectListView
+    MultipleObjectFormActionView, SingleObjectCreateView,
+    SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
-from permissions import Permission
 
 from .forms import PasswordForm, UserForm
 from .permissions import (
@@ -113,6 +111,79 @@ class GroupMembersView(AssignRemoveView):
         self.get_object().user_set.remove(item)
 
 
+class UserCreateView(SingleObjectCreateView):
+    extra_context = {
+        'title': _('Create new user'),
+    }
+    form_class = UserForm
+    view_permission = permission_user_create
+
+    def form_valid(self, form):
+        user = form.save(commit=False)
+        user.set_unusable_password()
+        user.save()
+        messages.success(
+            self.request, _('User "%s" created successfully.') % user
+        )
+        return HttpResponseRedirect(
+            reverse('user_management:user_set_password', args=(user.pk,))
+        )
+
+
+class UserDeleteView(MultipleObjectConfirmActionView):
+    model = get_user_model()
+    success_message = _('User delete request performed on %(count)d user')
+    success_message_plural = _(
+        'User delete request performed on %(count)d users'
+    )
+    view_permission = permission_user_delete
+
+    def get_extra_context(self):
+        queryset = self.get_queryset()
+
+        result = {
+            'title': ungettext(
+                'Delete user',
+                'Delete users',
+                queryset.count()
+            )
+        }
+
+        if queryset.count() == 1:
+            result.update(
+                {
+                    'object': queryset.first(),
+                    'title': _('Delete user: %s') % queryset.first()
+                }
+            )
+
+        return result
+
+    def object_action(self, form, instance):
+        try:
+            if instance.is_superuser or instance.is_staff:
+                messages.error(
+                    self.request,
+                    _(
+                        'Super user and staff user deleting is not '
+                        'allowed, use the admin interface for these cases.'
+                    )
+                )
+            else:
+                instance.delete()
+                messages.success(
+                    self.request, _(
+                        'User "%s" deleted successfully.'
+                    ) % instance
+                )
+        except Exception as exception:
+            messages.error(
+                self.request, _(
+                    'Error deleting user "%(user)s": %(error)s'
+                ) % {'user': instance, 'error': exception}
+            )
+
+
 class UserEditView(SingleObjectEditView):
     fields = ('username', 'first_name', 'last_name', 'email', 'is_active',)
     post_action_redirect = reverse_lazy('user_management:user_list')
@@ -175,183 +246,61 @@ class UserListView(SingleObjectListView):
         ).exclude(is_staff=True).order_by('last_name', 'first_name')
 
 
-def user_add(request):
+class UserSetPasswordView(MultipleObjectFormActionView):
-    Permission.check_permissions(request.user, (permission_user_create,))
+    form_class = PasswordForm
-
+    model = get_user_model()
-    if request.method == 'POST':
+    success_message = _('Password change request performed on %(count)d user')
-        form = UserForm(request.POST)
+    success_message_plural = _(
-        if form.is_valid():
+        'Password change request performed on %(count)d users'
-            user = form.save(commit=False)
-            user.set_unusable_password()
-            user.save()
-            messages.success(
-                request, _('User "%s" created successfully.') % user
-            )
-            return HttpResponseRedirect(
-                reverse('user_management:user_set_password', args=(user.pk,))
-            )
-    else:
-        form = UserForm()
-
-    return render_to_response('appearance/generic_form.html', {
-        'title': _('Create new user'),
-        'form': form,
-    }, context_instance=RequestContext(request))
-
-
-def user_delete(request, user_id=None, user_id_list=None):
-    Permission.check_permissions(request.user, (permission_user_delete,))
-    post_action_redirect = None
-
-    if user_id:
-        users = get_user_model().objects.filter(pk=user_id)
-        post_action_redirect = reverse('user_management:user_list')
-    elif user_id_list:
-        users = get_user_model().objects.filter(pk__in=user_id_list)
-
-    if not users:
-        messages.error(request, _('Must provide at least one user.'))
-        return HttpResponseRedirect(
-            request.META.get(
-                'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
-            )
-        )
-
-    previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
-    next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
-
-    if request.method == 'POST':
-        for user in users:
-            try:
-                if user.is_superuser or user.is_staff:
-                    messages.error(
-                        request,
-                        _(
-                            'Super user and staff user deleting is not '
-                            'allowed, use the admin interface for these cases.'
-                        )
-                    )
-                else:
-                    user.delete()
-                    messages.success(
-                        request, _('User "%s" deleted successfully.') % user
-                    )
-            except Exception as exception:
-                messages.error(
-                    request, _('Error deleting user "%(user)s": %(error)s') % {
-                        'user': user, 'error': exception
-                    }
-                )
-
-        return HttpResponseRedirect(next)
-
-    context = {
-        'delete_view': True,
-        'previous': previous,
-        'next': next,
-    }
-    if users.count() == 1:
-        context['object'] = users.first()
-        context['title'] = _('Delete the user: %s?') % ', '.join([unicode(d) for d in users])
-    elif len(users) > 1:
-        context['title'] = _('Delete the users: %s?') % ', '.join([unicode(d) for d in users])
-
-    return render_to_response(
-        'appearance/generic_confirm.html', context,
-        context_instance=RequestContext(request)
     )
+    view_permission = permission_user_edit
 
+    def get_extra_context(self):
+        queryset = self.get_queryset()
 
-def user_multiple_delete(request):
+        result = {
-    return user_delete(
+            'submit_label': _('Submit'),
-        request, user_id_list=request.GET.get(
+            'title': ungettext(
-            'id_list', request.POST.get('id_list', '')
+                'Change user password',
-        ).split(',')
+                'Change users passwords',
-    )
+                queryset.count()
-
-
-def user_set_password(request, user_id=None, user_id_list=None):
-    Permission.check_permissions(request.user, (permission_user_edit,))
-    post_action_redirect = None
-
-    if user_id:
-        users = get_user_model().objects.filter(pk=user_id)
-        post_action_redirect = reverse('user_management:user_list')
-    elif user_id_list:
-        users = get_user_model().objects.filter(pk__in=user_id_list)
-
-    if not users:
-        messages.error(request, _('Must provide at least one user.'))
-        return HttpResponseRedirect(
-            request.META.get(
-                'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)
             )
-        )
+        }
 
-    next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
+        if queryset.count() == 1:
+            result.update(
+                {
+                    'object': queryset.first(),
+                    'title': _('Change password for user: %s') % queryset.first()
+                }
+            )
 
-    if request.method == 'POST':
+        return result
-        form = PasswordForm(request.POST)
+
-        if form.is_valid():
+    def object_action(self, form, instance):
-            password_1 = form.cleaned_data['new_password_1']
+        try:
-            password_2 = form.cleaned_data['new_password_2']
+            if instance.is_superuser or instance.is_staff:
-            if password_1 != password_2:
                 messages.error(
-                    request, _('Passwords do not match, try again.')
+                    self.request,
+                    _(
+                        'Super user and staff user password '
+                        'reseting is not allowed, use the admin '
+                        'interface for these cases.'
+                    )
                 )
             else:
-                for user in users:
+                instance.set_password(form.cleaned_data['new_password_1'])
-                    try:
+                instance.save()
-                        if user.is_superuser or user.is_staff:
+                messages.success(
-                            messages.error(
+                    self.request, _(
-                                request,
+                        'Successfull password reset for user: %s.'
-                                _(
+                    ) % instance
-                                    'Super user and staff user password '
+                )
-                                    'reseting is not allowed, use the admin '
+        except Exception as exception:
-                                    'interface for these cases.'
+            messages.error(
-                                )
+                self.request, _(
-                            )
+                    'Error reseting password for user "%(user)s": %(error)s'
-                        else:
+                ) % {
-                            user.set_password(password_1)
+                    'user': instance, 'error': exception
-                            user.save()
+                }
-                            messages.success(
+            )
-                                request, _(
-                                    'Successfull password reset for user: %s.'
-                                ) % user
-                            )
-                    except Exception as exception:
-                        messages.error(
-                            request, _(
-                                'Error reseting password for user "%(user)s": %(error)s'
-                            ) % {
-                                'user': user, 'error': exception
-                            }
-                        )
-
-                return HttpResponseRedirect(next)
-    else:
-        form = PasswordForm()
-
-    context = {
-        'next': next,
-        'form': form,
-    }
-
-    if users.count() == 1:
-        context['object'] = users.first()
-        context['title'] = _('Reseting password for user: %s') % ', '.join([unicode(d) for d in users])
-    elif len(users) > 1:
-        context['title'] = _('Reseting password for users: %s') % ', '.join([unicode(d) for d in users])
-
-    return render_to_response(
-        'appearance/generic_form.html', context,
-        context_instance=RequestContext(request)
-    )
-
-
-def user_multiple_set_password(request):
-    return user_set_password(
-        request, user_id_list=request.GET.get(
-            'id_list', request.POST.get('id_list', '')
-        ).split(',')
-    )