diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index d79ed2f7e7..cad03e38c8 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -260,8 +260,8 @@ class IndexQueryTestCase(ModuleStoreTestCase): NUM_PROBLEMS = 20 @ddt.data( - (ModuleStoreEnum.Type.mongo, 10, 181), - (ModuleStoreEnum.Type.split, 4, 177), + (ModuleStoreEnum.Type.mongo, 10, 182), + (ModuleStoreEnum.Type.split, 4, 178), ) @ddt.unpack def test_index_query_counts(self, store_type, expected_mongo_query_count, expected_mysql_query_count): diff --git a/lms/djangoapps/courseware/views/index.py b/lms/djangoapps/courseware/views/index.py index 18d95218c9..d1e7cbaf3e 100644 --- a/lms/djangoapps/courseware/views/index.py +++ b/lms/djangoapps/courseware/views/index.py @@ -35,6 +35,7 @@ from lms.djangoapps.courseware.exceptions import CourseAccessRedirect from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context from lms.djangoapps.gating.api import get_entrance_exam_score_ratio, get_entrance_exam_usage_key from lms.djangoapps.grades.api import CourseGradeFactory +from openedx.core.djangoapps.content.course_overviews.models import CourseOverview from openedx.core.djangoapps.crawlers.models import CrawlersConfig from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY from openedx.core.djangoapps.user_api.preferences.api import get_user_preference @@ -136,6 +137,7 @@ class CoursewareIndex(View): depth=CONTENT_DEPTH, check_if_enrolled=not self.enable_unenrolled_access, ) + self.course_overview = CourseOverview.get_from_id(self.course.id) if self.enable_unenrolled_access: # Check if the user is considered enrolled (i.e. is an enrolled learner or staff). @@ -457,7 +459,7 @@ class CoursewareIndex(View): ) courseware_context['course_sock_fragment'] = CourseSockFragmentView().render_to_fragment( - request, course=self.course) + request, course=self.course_overview) # entrance exam data self._add_entrance_exam_to_context(courseware_context) diff --git a/openedx/features/course_experience/views/course_home.py b/openedx/features/course_experience/views/course_home.py index 4dd62c0b81..83c70eb224 100644 --- a/openedx/features/course_experience/views/course_home.py +++ b/openedx/features/course_experience/views/course_home.py @@ -147,6 +147,7 @@ class CourseHomeFragmentView(EdxFragmentView): resume_course_url = None handouts_html = None + course_overview = CourseOverview.get_from_id(course.id) if user_access['is_enrolled'] or user_access['is_staff']: outline_fragment = CourseOutlineFragmentView().render_to_fragment( request, course_id=course_id, **kwargs @@ -159,10 +160,11 @@ class CourseHomeFragmentView(EdxFragmentView): update_message_fragment = WelcomeMessageFragmentView().render_to_fragment( request, course_id=course_id, **kwargs ) - course_sock_fragment = CourseSockFragmentView().render_to_fragment(request, course=course, **kwargs) + course_sock_fragment = CourseSockFragmentView().render_to_fragment( + request, course=course_overview, **kwargs + ) has_visited_course, resume_course_url = self._get_resume_course_info(request, course_id) handouts_html = self._get_course_handouts(request, course) - course_overview = CourseOverview.get_from_id(course.id) offer_banner_fragment = get_first_purchase_offer_banner_fragment( request.user, course_overview @@ -210,7 +212,7 @@ class CourseHomeFragmentView(EdxFragmentView): # TODO Add switch to control deployment if SHOW_UPGRADE_MSG_ON_COURSE_HOME.is_enabled(course_key) and enrollment and enrollment.upgrade_deadline: upgrade_url = EcommerceService().upgrade_url(request.user, course_key) - upgrade_price, has_discount = format_strikeout_price(request.user, course) + upgrade_price, has_discount = format_strikeout_price(request.user, course_overview) show_search = ( settings.FEATURES.get('ENABLE_COURSEWARE_SEARCH') or