From 2e5b922692045a6d595b48c78cd9f7062f5e9946 Mon Sep 17 00:00:00 2001 From: Phillip Shiu Date: Tue, 31 Aug 2021 16:24:38 -0400 Subject: [PATCH 01/12] fix: abstract track selection bullets into new mako template --- common/djangoapps/course_modes/views.py | 18 +++--- .../course_modes/track_selection.html | 56 +---------------- .../track_selection_types/full_fbe.html | 63 +++++++++++++++++++ lms/templates/main.html | 2 +- 4 files changed, 76 insertions(+), 63 deletions(-) create mode 100644 lms/templates/course_modes/track_selection_types/full_fbe.html diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py index 9195eb1679..b2cc6dc2ba 100644 --- a/common/djangoapps/course_modes/views.py +++ b/common/djangoapps/course_modes/views.py @@ -260,14 +260,16 @@ class ChooseModeView(View): # REV-2133 TODO Value Prop: remove waffle flag after testing is completed # and happy path version is ready to be rolled out to all users. - if VALUE_PROP_TRACK_SELECTION_FLAG.is_enabled(): - # First iteration of happy path does not handle errors. If there are enrollment errors for a learner that is - # technically considered happy path, old Track Selection page will be displayed. - if not error: - # Happy path conditions. - if verified_mode and fbe_is_on and not enterprise_customer: - return render_to_response("course_modes/track_selection.html", context) - return render_to_response("course_modes/choose.html", context) + #if VALUE_PROP_TRACK_SELECTION_FLAG.is_enabled(): + # First iteration of happy path does not handle errors. If there are enrollment errors for a learner that is + # technically considered happy path, old Track Selection page will be displayed. + LOG.info('verified mode: [%s], fbe_is_on: [%s], enterprise_customer: [%s]', verified_mode, fbe_is_on, enterprise_customer) + LOG.info('deadline: [%s], gated_content: [%s], duration: [%s], get_user_course_expiration_date: [%s]', deadline, gated_content, duration, get_user_course_expiration_date(request.user, course)) + if not error: + # Happy path conditions. + if verified_mode and fbe_is_on and not enterprise_customer: + return render_to_response("course_modes/track_selection_types/full_fbe.html", context) + #return render_to_response("course_modes/choose.html", context) @method_decorator(transaction.non_atomic_requests) @method_decorator(login_required) diff --git a/lms/templates/course_modes/track_selection.html b/lms/templates/course_modes/track_selection.html index f710fc167e..5e88555338 100644 --- a/lms/templates/course_modes/track_selection.html +++ b/lms/templates/course_modes/track_selection.html @@ -95,43 +95,7 @@ from openedx.core.djangolib.js_utils import js_escaped_string

${currency_symbol}${min_price} ${currency}

${_("Earn a certificate")}

-
- -
- + <%block name="track_selection_certificate_bullets"/>