codeforlife-portal 7.4.7__py2.py3-none-any.whl → 7.4.8__py2.py3-none-any.whl

{codeforlife_portal-7.4.7.dist-info → codeforlife_portal-7.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.7
+Version: 7.4.8
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -21,7 +21,7 @@ Requires-Dist: django-classy-tags==2.0.0
 Requires-Dist: libsass==0.23.0
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: more-itertools==8.7.0
-Requires-Dist: cfl-common==7.4.7
+Requires-Dist: cfl-common==7.4.8
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.4.7.dist-info → codeforlife_portal-7.4.8.dist-info}/RECORD

@@ -108,7 +108,7 @@ example_project/portal_test_settings.py,sha256=_gI7-HMoPJ-cDGO6n5UlEIHKHuTR5SC_X
 example_project/settings.py,sha256=HgGSG0n6Xggd0NieFVoJgn8vKGqyRbCddoB3CRuoT-Y,5640
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=u4NoBVHR1T-STbqzVWCh66zP8QxD3S_5n4P87Q_xWOA,22
+portal/__init__.py,sha256=eAE4OHpS0-RnpxEDrTUasRa2OlGd49xIz11PQ0QSctc,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -548,7 +548,7 @@ portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
 portal/tests/test_teacher.py,sha256=vjnJi_aj_x48OJOMMRIBr0JTCxy4tFxqrLfCgw0fRxQ,29315
 portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
-portal/tests/test_views.py,sha256=krg_3ZPbpPti7WNFyQkP7Mg4yX4_1dErZAX2iRJ2hu0,46751
+portal/tests/test_views.py,sha256=fBh8fZkS4p9iMEqeMgSSAcL09nH6TCohwdX4BuysxjQ,47389
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/tests/migrations/test_migration_make_portaladmin_teacher.py,sha256=ekMRb6cU97oT0k9gCKW7IUB7oPuGmv4uWJCqInQN7x8,2589
 portal/tests/migrations/test_migration_preview_user_remove.py,sha256=K6D-FZT9YFEA8oMxHz9VTglVV6MZOTRYVlvwWwXc2vU,555
@@ -626,13 +626,13 @@ portal/views/student/edit_account_details.py,sha256=Ba-3D_zzKbX5N01NG5qqBS0ud10B
 portal/views/student/play.py,sha256=GMxk65bxWOe1Ds2kb6rvuOd1GoAtt5v_9AihLNXoUL0,8768
 portal/views/teacher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/teacher/dashboard.py,sha256=pjzOOCz29d4VHukaCI5QhkDsu-RPvy7SXC9dDcPo50k,27422
-portal/views/teacher/teach.py,sha256=yWe2K0FHEQB_K3vzPJO8MR0gU2ZaDrXGw8gXMJBH0T0,35765
+portal/views/teacher/teach.py,sha256=-9zzpNLR2oRkyBFXzXjL0_ew_Qpk27w7uca5rKNeCgE,35988
 portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-7.4.7.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.4.7.dist-info/METADATA,sha256=s2XuydXH4SnXsts2aElQJ_FeKkJShvHfoJgWIC7v24I,3317
-codeforlife_portal-7.4.7.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.4.7.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.4.7.dist-info/RECORD,,
+codeforlife_portal-7.4.8.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.4.8.dist-info/METADATA,sha256=8LxLcXj1qTb6mYTLNjjb5_bkRFBpSwz0Z2vCVSXPQOs,3317
+codeforlife_portal-7.4.8.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.4.8.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.4.8.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.4.7"
+__version__ = "7.4.8"

portal/tests/test_views.py

@@ -252,11 +252,24 @@ class TestTeacherViews(TestCase):
         assert response.status_code == 302
 
         student = Student.objects.get(pk=self.student.pk)
+        
         assert student.user.is_verified
 
         c.logout()
         c.login(username=self.email, password=self.password)
 
+        teacher = Teacher.objects.factory("the", "teacher", "theteacher@foo.com", "password")
+        level = Level.objects.create()
+        
+        level.owner = student.new_user.userprofile
+        level.shared_with.add(teacher.new_user)
+        level.save()
+
+        students_levels = Level.objects.filter(owner=student.new_user.userprofile).all()
+
+        for level in students_levels.all():
+            assert level.shared_with.exists()
+
         release_url = reverse(
             "teacher_dismiss_students", args=[self.class_access_code]
         )
@@ -279,6 +292,11 @@ class TestTeacherViews(TestCase):
         student = Student.objects.get(pk=self.student.pk)
         assert not student.user.is_verified
 
+        students_levels = Level.objects.filter(owner=student.new_user.userprofile).all()
+
+        for level in students_levels.all():
+            assert not level.shared_with.exists()
+
 
 class TestLoginViews(TestCase):
     @classmethod

portal/views/teacher/teach.py

@@ -39,6 +39,8 @@ from reportlab.lib.pagesizes import A4
 from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
 
+from game.models import Level
+
 from portal.forms.teach import (
     BaseTeacherDismissStudentsFormSet,
     BaseTeacherMoveStudentsDisambiguationFormSet,
@@ -56,6 +58,7 @@ from portal.forms.teach import (
 from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 from portal.views.registration import handle_reset_password_tracking
 
+
 STUDENT_PASSWORD_LENGTH = 6
 REMINDER_CARDS_PDF_ROWS = 8
 REMINDER_CARDS_PDF_COLUMNS = 1
@@ -616,6 +619,11 @@ def process_dismiss_student_form(request, formset, klass, access_code):
             new_user__first_name__iexact=data["orig_name"],
         )
 
+        students_levels = Level.objects.filter(owner=student.new_user.userprofile).all()
+        for level in students_levels:
+            level.shared_with.set([])
+            level.save()
+
         student.class_field = None
         student.new_user.first_name = data["name"]
         student.new_user.username = data["email"]