diff --git a/myuw/test/views/test_teaching.py b/myuw/test/views/test_teaching.py index 9877b349d..559be9bec 100644 --- a/myuw/test/views/test_teaching.py +++ b/myuw/test/views/test_teaching.py @@ -17,6 +17,19 @@ def test_instrucor_access(self): HTTP_USER_AGENT="Lynx/2.8.2rel.1 libwww-FM/2.14") self.assertEqual(response.status_code, 200) + @skipIf(missing_url("myuw_teaching_page", + kwargs={}), "myuw urls not configured") + def test_current_quarter_access(self): + url = reverse("myuw_teaching_page", kwargs={}) + self.set_user('bill') + response = self.client.get( + url, + HTTP_USER_AGENT="Lynx/2.8.2rel.1 libwww-FM/2.14") + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context['display_term']["year"], 2013) + self.assertEqual( + response.context['display_term']["quarter"], 'spring') + @skipIf(missing_url("myuw_teaching_page", kwargs={'year': '2013', 'quarter': 'summer'}), "myuw urls not configured") diff --git a/myuw/urls.py b/myuw/urls.py index 58679a134..d9074d32d 100644 --- a/myuw/urls.py +++ b/myuw/urls.py @@ -293,6 +293,8 @@ student_photo_list, name="myuw_photo_list"), re_path(r'^teaching/(?P2[0-9]{3}),(?P[a-z]+)$', teaching, name="myuw_teaching_page"), + # MUWM-5363 + re_path(r'^teaching/current$', teaching, name="myuw_teaching_page"), re_path(r'^teaching/?$', teaching, name="myuw_teaching_page"), re_path(r'^notices/?', notices, name="myuw_notices_page"), re_path(r'^thrive_messages/?', thrive_messages, diff --git a/myuw/views/teaching.py b/myuw/views/teaching.py index cfe557b73..d45dd2f50 100644 --- a/myuw/views/teaching.py +++ b/myuw/views/teaching.py @@ -1,6 +1,7 @@ # Copyright 2024 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 +from myuw.dao.term import get_current_quarter from myuw.views.page import page from myuw.util.page_view import page_view @@ -9,7 +10,12 @@ def teaching(request, year=None, quarter=None): - context = get_context(year, quarter) + if year is None and quarter is None: + # MUWM-5363 + term = get_current_quarter(request) + context = get_context(term.year, term.quarter) + else: + context = get_context(year, quarter) return page(request, 'teaching.html', context=context) diff --git a/myuw_vue/components/teaching/classlist/photo-list.vue b/myuw_vue/components/teaching/classlist/photo-list.vue index 9e9b29f49..7c85d5003 100644 --- a/myuw_vue/components/teaching/classlist/photo-list.vue +++ b/myuw_vue/components/teaching/classlist/photo-list.vue @@ -6,7 +6,7 @@

Grid of Student Photos

-
+