codeforlife-portal 7.3.1__py2.py3-none-any.whl → 7.3.3__py2.py3-none-any.whl

{codeforlife_portal-7.3.1.dist-info → codeforlife_portal-7.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.3.1
+Version: 7.3.3
 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.3.1
+Requires-Dist: cfl-common==7.3.3
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.3.1.dist-info → codeforlife_portal-7.3.3.dist-info}/RECORD

@@ -107,7 +107,7 @@ example_project/portal_test_settings.py,sha256=NfLY72mt1LR2c0_kxF-Yg5pCm2vQ52ece
 example_project/settings.py,sha256=Smpr5FHAaQQhXPgh6-Zsy-jnH5_ZV9htPTWJWlGqptI,5575
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=EwNAYkUpUieq_F_-i4iAHHUWZC-cpSOWZYMwaEyUOT0,22
+portal/__init__.py,sha256=0toPzfNzgKGz4jRa-Ox6B7nbLNoBzmpwgBujvzkybx0,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -469,7 +469,7 @@ portal/templates/portal/partials/card_list.html,sha256=yHcp4oc0WRG9H6Ek871VCHbwY
 portal/templates/portal/partials/character_list.html,sha256=SnNFHzbIkOSaiRPIvSdplEf_B87UYgJ1pOvMltNDxLE,415
 portal/templates/portal/partials/delete_popup.html,sha256=nEhnwgnmKoFzb6LlCwdX973Em9bVOFh6MON36RPteYs,1275
 portal/templates/portal/partials/footer.html,sha256=V6xKYyhPoqSRUL0HQu7OB9vKVJWun8Q0PUGa5Dbdyl4,4922
-portal/templates/portal/partials/header.html,sha256=musjJqC4abBo63vF0Sgkyx1p6qJt-4lKD2WNq03k7KA,20052
+portal/templates/portal/partials/header.html,sha256=HRrfwyUFhuuTKSp0bzFXsNwuQ_cBLyxnvw2bgV1jMbw,20142
 portal/templates/portal/partials/headline.html,sha256=xKb-WtkT0FyQqT0smyNSKkXFvU7KQ5Czad8ca6YKQg4,89
 portal/templates/portal/partials/hero_card.html,sha256=UN5hyxrw-McuXFsDzPBIECB9yGrv9VjsFf8SEBowwXc,786
 portal/templates/portal/partials/info_popup.html,sha256=gzffd5MBVb7p2hGQuZMNDudThrRgs847hCu9ziT9uLE,566
@@ -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=8WglspwuHF__2LtoX5_XvoW1ulICSupjKv--MtjrvJk,25714
-portal/views/teacher/teach.py,sha256=DFQSiC3RokLMArR_jTinFOqdymMa9phUOmwK0xBoDdk,37039
+portal/views/teacher/teach.py,sha256=MxheM_kxt_K1J7jEWlim8yZonnp63iYUTw5dCaLscLI,37056
 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.3.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.3.1.dist-info/METADATA,sha256=86OkP1HAPvcVixUEN2CN5nWJLKPR_E8KMAqfM_Pd6T8,3317
-codeforlife_portal-7.3.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.3.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.3.1.dist-info/RECORD,,
+codeforlife_portal-7.3.3.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.3.3.dist-info/METADATA,sha256=ZnS_f1ciHft66Np8pW27jVf4WWyxwYGSYZyTNI8sMHo,3317
+codeforlife_portal-7.3.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.3.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.3.3.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.3.1"
+__version__ = "7.3.3"

portal/templates/portal/partials/header.html

@@ -157,19 +157,19 @@
                         <li class="dropdown-menu__option">
                             <a id="teacher_login_button" class="button--regular" aria-labelledby="Teacher" href="{% url 'teacher_login' %}">
                                 <div class="dropdown-menu__option__text">Teacher</div>
-                                <span class="material-icons-outlined">chevron_right</span>
+                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
                             </a>
                         </li>
                         <li class="dropdown-menu__option">
                             <a id="student_login_button" class="button--regular" aria-labelledby="Student" href="{% url 'student_login_access_code' %}">
                                 <div class="dropdown-menu__option__text">Student</div>
-                                <span class="material-icons-outlined">chevron_right</span>
+                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
                             </a>
                         </li>
                         <li class="dropdown-menu__option">
                             <a id="independent_login_button" class="button--regular" aria-labelledby="Independent" href="{% url 'independent_student_login' %}">
                                 <div class="dropdown-menu__option__text">Independent</div>
-                                <span class="material-icons-outlined">chevron_right</span>
+                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
                             </a>
                         </li>
                     </ul>
@@ -243,11 +243,11 @@
                     data-toggle="collapse" data-target="#login-tabs">Log in</button>
             <div id="login-tabs" class="collapse">
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'teacher_login' %}">Teacher<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'teacher_login' %}">Teacher<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'student_login_access_code' %}">Student<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'student_login_access_code' %}">Student<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
                 <a class="button button--menu__item button--menu__item__sub"
-                  href="{% url 'independent_student_login' %}">Independent<span class="material-icons-outlined md-32">chevron_right</span></a>
+                  href="{% url 'independent_student_login' %}">Independent<span data-nosnippet class="material-icons-outlined md-32">chevron_right</span></a>
             </div>
             <a class="button button--menu__item" href="{% url 'teach' %}">Teacher
                 <span class="material-icons-outlined md-32">chevron_right</span></a>

portal/views/teacher/teach.py

@@ -868,12 +868,13 @@ def teacher_move_students_to_class(request, access_code):
 
 
 def check_if_move_authorised(request, old_class, new_class):
-    # check user is authorised to deal with class
-    if request.user.new_teacher != old_class.teacher:
-        raise Http404
+    teacher = request.user.new_teacher
 
-    # check teacher authorised to transfer to new class
-    if request.user.new_teacher.school != new_class.teacher.school:
+    # check teacher has permission to edit old_class and that both classes
+    # are in the same school
+    if (
+        not teacher.is_admin and teacher != old_class.teacher
+    ) or teacher.school != new_class.teacher.school:
         raise Http404