Merge branch 'improvements' into 'master'

Improvements

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

apps/registration/__init__.py

@@ -1 +1,4 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 default_app_config = 'registration.apps.RegistrationConfig'

apps/registration/admin.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib import admin
 from polymorphic.admin import PolymorphicChildModelAdmin, PolymorphicParentModelAdmin
 

apps/registration/apps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.apps import AppConfig
 from django.db.models.signals import post_save, pre_save
 

apps/registration/auth.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from cas_server.auth import DjangoAuthUser  # pragma: no cover
 
 

apps/registration/forms.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User

apps/registration/migrations/0001_initial.py

@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
                 ('student_class', models.IntegerField(choices=[(12, '12th grade'), (11, '11th grade'), (10, '10th grade or lower')], verbose_name='student class')),
                 ('school', models.CharField(max_length=255, verbose_name='school')),
                 ('photo_authorization', models.FileField(blank=True, default='', upload_to=registration.models.get_random_filename, verbose_name='photo authorization')),
-                ('team', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='students', to='participation.team', verbose_name='team')),
+                ('team', models.ForeignKey(default=None, blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='students', to='participation.team', verbose_name='team')),
             ],
             options={
                 'verbose_name': 'student registration',
@@ -63,7 +63,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('registration_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registration.registration')),
                 ('professional_activity', models.TextField(verbose_name='professional activity')),
-                ('team', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='coachs', to='participation.team', verbose_name='team')),
+                ('team', models.ForeignKey(default=None, blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='coachs', to='participation.team', verbose_name='team')),
             ],
             options={
                 'verbose_name': 'coach registration',

apps/registration/migrations/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/registration/models.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.tokens import email_validation_token
 from django.contrib.sites.models import Site
 from django.db import models
@@ -102,6 +105,7 @@ class StudentRegistration(Registration):
         related_name="students",
         on_delete=models.PROTECT,
         null=True,
+        blank=True,
         default=None,
         verbose_name=_("team"),
     )
@@ -151,6 +155,7 @@ class CoachRegistration(Registration):
         related_name="coachs",
         on_delete=models.PROTECT,
         null=True,
+        blank=True,
         default=None,
         verbose_name=_("team"),
     )

apps/registration/search_indexes.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from haystack import indexes
 
 from .models import Registration

apps/registration/signals.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.lists import get_sympa_client
 from corres2math.matrix import Matrix
 from django.contrib.auth.models import User

apps/registration/tables.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 

apps/registration/templatetags/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/registration/templatetags/search_results_tables.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django import template
 from django_tables2 import Table
 from participation.models import Participation, Team, Video

apps/registration/tests.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from datetime import timedelta
 import os
 

apps/registration/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.urls import path
 
 from .views import MyAccountDetailView, ResetAdminView, SignupView, UserDetailView, UserImpersonateView, \

apps/registration/views.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 from corres2math.tokens import email_validation_token
@@ -210,7 +213,7 @@ 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 not self.request.user.registration.is_admin:
             if "team" in context["registration_form"].fields:
                 del context["registration_form"].fields["team"]
             del context["registration_form"].fields["email_confirmed"]
@@ -221,7 +224,7 @@ 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 not self.request.user.registration.is_admin:
             if "team" in registration_form.fields:
                 del registration_form.fields["team"]
             del registration_form.fields["email_confirmed"]