merge from master

ocadotechnology · Nov 7, 2023 · 30756b1 · 30756b1
2 parents 438a97b + 4267193
commit 30756b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/portal/__init__.py b/portal/__init__.py
@@ -1 +1 @@
-__version__ = "6.38.1"
+__version__ = "6.38.2"
diff --git a/portal/views/teacher/dashboard.py b/portal/views/teacher/dashboard.py
@@ -2,17 +2,12 @@
 from uuid import uuid4
 
 from common import email_messages
-from common.helpers.emails import (
-    INVITE_FROM,
-    NOTIFICATION_EMAIL,
-    DotmailerUserType,
-    add_to_dotmailer,
-    generate_token,
-    send_email,
-    update_email,
-)
+from common.helpers.emails import (INVITE_FROM, NOTIFICATION_EMAIL,
+                                   DotmailerUserType, add_to_dotmailer,
+                                   generate_token, send_email, update_email)
 from common.helpers.generators import get_random_username
-from common.models import Class, JoinReleaseStudent, SchoolTeacherInvitation, Student, Teacher
+from common.models import (Class, JoinReleaseStudent, SchoolTeacherInvitation,
+                           Student, Teacher)
 from common.permissions import check_teacher_authorised, logged_in_as_teacher
 from common.utils import using_two_factor
 from django.contrib import messages as messages
@@ -30,20 +25,14 @@
 from portal.forms.invite_teacher import InviteTeacherForm
 from portal.forms.organisation import OrganisationForm
 from portal.forms.registration import DeleteAccountForm
-from portal.forms.teach import (
-    ClassCreationForm,
-    InvitedTeacherForm,
-    TeacherAddExternalStudentForm,
-    TeacherEditAccountForm,
-)
+from portal.forms.teach import (ClassCreationForm, InvitedTeacherForm,
+                                TeacherAddExternalStudentForm,
+                                TeacherEditAccountForm)
 from portal.helpers.decorators import ratelimit
 from portal.helpers.password import check_update_password
-from portal.helpers.ratelimit import (
-    RATELIMIT_LOGIN_GROUP,
-    RATELIMIT_LOGIN_RATE,
-    RATELIMIT_METHOD,
-    clear_ratelimit_cache_for_user,
-)
+from portal.helpers.ratelimit import (RATELIMIT_LOGIN_GROUP,
+                                      RATELIMIT_LOGIN_RATE, RATELIMIT_METHOD,
+                                      clear_ratelimit_cache_for_user)
 
 from .teach import create_class