Merge branch 'improvements' into 'master'

Improvements

See merge request animath/si/plateforme-corres2math!7

apps/registration/forms.py

@@ -64,7 +64,7 @@ class StudentRegistrationForm(forms.ModelForm):
     """
     class Meta:
         model = StudentRegistration
-        fields = ('student_class', 'school', 'give_contact_to_animath',)
+        fields = ('team', 'student_class', 'school', 'give_contact_to_animath', 'email_confirmed',)
 
 
 class PhotoAuthorizationForm(forms.ModelForm):
@@ -92,7 +92,7 @@ class CoachRegistrationForm(forms.ModelForm):
     """
     class Meta:
         model = CoachRegistration
-        fields = ('professional_activity', 'give_contact_to_animath',)
+        fields = ('team', 'professional_activity', 'give_contact_to_animath', 'email_confirmed',)
 
 
 class AdminRegistrationForm(forms.ModelForm):
@@ -101,4 +101,4 @@ class AdminRegistrationForm(forms.ModelForm):
     """
     class Meta:
         model = AdminRegistration
-        fields = ('role', 'give_contact_to_animath',)
+        fields = ('role', 'give_contact_to_animath', 'email_confirmed',)

apps/registration/templates/registration/user_list.html

@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% load django_tables2 %}
+
+{% block content %}
+    {% render_table table %}
+{% endblock %}

apps/registration/tests.py

@@ -31,6 +31,10 @@ class TestIndexPage(TestCase):
         response = self.client.get(reverse("registration:reset_admin"))
         self.assertRedirects(response, reverse("login") + "?next=" + reverse("registration:reset_admin"), 302, 200)
 
+        User.objects.create()
+        response = self.client.get(reverse("registration:user_detail", args=(1,)))
+        self.assertRedirects(response, reverse("login") + "?next=" + reverse("registration:user_detail", args=(1,)))
+
 
 class TestRegistration(TestCase):
     def setUp(self) -> None:
@@ -199,6 +203,13 @@ class TestRegistration(TestCase):
         response = self.client.get(reverse("registration:user_detail", args=(self.user.pk,)))
         self.assertEqual(response.status_code, 200)
 
+    def test_user_list(self):
+        """
+        Display the list of all users.
+        """
+        response = self.client.get(reverse("registration:user_list"))
+        self.assertEqual(response.status_code, 200)
+
     def test_update_user(self):
         """
         Update the user information, for each type of user.
@@ -222,6 +233,8 @@ class TestRegistration(TestCase):
                 last_name="Name",
                 email="new_" + user.email,
                 give_contact_to_animath=True,
+                email_confirmed=True,
+                team_id="",
             ))
             self.assertEqual(response.status_code, 200)
 
@@ -230,6 +243,8 @@ class TestRegistration(TestCase):
                 last_name="Name",
                 email="new_" + user.email,
                 give_contact_to_animath=True,
+                email_confirmed=True,
+                team_id="",
             )
             response = self.client.post(reverse("registration:update_user", args=(user.pk,)), data=data)
             self.assertRedirects(response, reverse("registration:user_detail", args=(user.pk,)), 302, 200)

apps/registration/urls.py

@@ -1,7 +1,7 @@
 from django.urls import path
 
 from .views import MyAccountDetailView, ResetAdminView, SignupView, UserDetailView, UserImpersonateView, \
-    UserResendValidationEmailView, UserUpdateView, UserUploadPhotoAuthorizationView, UserValidateView, \
+    UserListView, UserResendValidationEmailView, UserUpdateView, UserUploadPhotoAuthorizationView, UserValidateView, \
     UserValidationEmailSentView
 
 app_name = "registration"
@@ -18,5 +18,6 @@ urlpatterns = [
     path("user/<int:pk>/upload-photo-authorization/", UserUploadPhotoAuthorizationView.as_view(),
          name="upload_user_photo_authorization"),
     path("user/<int:pk>/impersonate/", UserImpersonateView.as_view(), name="user_impersonate"),
+    path("user/list/", UserListView.as_view(), name="user_list"),
     path("reset-admin/", ResetAdminView.as_view(), name="reset_admin"),
 ]

apps/registration/views.py

@@ -1,6 +1,9 @@
 import os
 
+from django_tables2 import SingleTableView
+
 from corres2math.tokens import email_validation_token
+from corres2math.views import AdminMixin
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
@@ -16,7 +19,8 @@ from magic import Magic
 from participation.models import Phase
 
 from .forms import CoachRegistrationForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm
-from .models import StudentRegistration
+from .models import StudentRegistration, Registration
+from .tables import RegistrationTable
 
 
 class SignupView(CreateView):
@@ -43,6 +47,11 @@ class SignupView(CreateView):
         context["student_registration_form"] = StudentRegistrationForm(self.request.POST or None)
         context["coach_registration_form"] = CoachRegistrationForm(self.request.POST or None)
 
+        del context["student_registration_form"].fields["team"]
+        del context["student_registration_form"].fields["email_confirmed"]
+        del context["coach_registration_form"].fields["team"]
+        del context["coach_registration_form"].fields["email_confirmed"]
+
         return context
 
     @transaction.atomic
@@ -52,6 +61,8 @@ class SignupView(CreateView):
             registration_form = StudentRegistrationForm(self.request.POST)
         else:
             registration_form = CoachRegistrationForm(self.request.POST)
+        del registration_form.fields["team"]
+        del registration_form.fields["email_confirmed"]
 
         if not registration_form.is_valid():
             return self.form_invalid(form)
@@ -158,6 +169,8 @@ class UserDetailView(LoginRequiredMixin, DetailView):
 
     def dispatch(self, request, *args, **kwargs):
         user = request.user
+        if not user.is_authenticated:
+            return self.handle_no_permission()
         # Only an admin or the concerned user can see the information
         if not user.registration.is_admin and user.pk != kwargs["pk"]:
             raise PermissionDenied
@@ -169,6 +182,15 @@ class UserDetailView(LoginRequiredMixin, DetailView):
         return context
 
 
+class UserListView(AdminMixin, SingleTableView):
+    """
+    Display the list of all registered users.
+    """
+    model = Registration
+    table_class = RegistrationTable
+    template_name = "registration/user_list.html"
+
+
 class UserUpdateView(LoginRequiredMixin, UpdateView):
     """
     Update the detail about a user and its registration.
@@ -189,6 +211,10 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         context["title"] = _("Update user {user}").format(user=str(self.object.registration))
         context["registration_form"] = user.registration.form_class(data=self.request.POST or None,
                                                                     instance=self.object.registration)
+        if not user.registration.is_admin:
+            if "team" in context["registration_form"].fields:
+                del context["registration_form"].fields["team"]
+            del context["registration_form"].fields["email_confirmed"]
         return context
 
     @transaction.atomic
@@ -196,6 +222,11 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         user = form.instance
         registration_form = user.registration.form_class(data=self.request.POST or None,
                                                          instance=self.object.registration)
+        if not user.registration.is_admin:
+            if "team" in registration_form.fields:
+                del registration_form.fields["team"]
+            del registration_form.fields["email_confirmed"]
+
         if not registration_form.is_valid():
             return self.form_invalid(form)