Unverified Commit 3f9ab6ef by Harry Rein Committed by GitHub

Merge pull request #16955 from edx/HarryRein/LEARNER-3646-change-or-leave-session

Update entitlement card to use Change or Leave Session.
parents a4fa04ec 908c769a
...@@ -407,7 +407,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin): ...@@ -407,7 +407,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin):
- exactly one course item, meaning it: - exactly one course item, meaning it:
- has an entitlement card - has an entitlement card
- does NOT have a course card referencing the selected session - does NOT have a course card referencing the selected session
- an unhidden Change Session button - an unhidden Change or Leave Session button
- a related programs message - a related programs message
""" """
mocked_course_overview = CourseOverviewFactory( mocked_course_overview = CourseOverviewFactory(
......
...@@ -148,7 +148,7 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_ ...@@ -148,7 +148,7 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_
% endif % endif
% if entitlement: % if entitlement:
% if not entitlement_expired_at: % if not entitlement_expired_at:
<button class="change-session btn-link ${'hidden' if is_unfulfilled_entitlement else ''}" aria-controls="change-session-${str(entitlement.uuid)}">${_('Change Session')}</button> <button class="change-session btn-link ${'hidden' if is_unfulfilled_entitlement else ''}" aria-controls="change-session-${str(entitlement.uuid)}">${_('Change or Leave Session')}</button>
% endif % endif
% endif % endif
</span> </span>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<% if (dateString && !is_unfulfilled_entitlement) { %> <% if (dateString && !is_unfulfilled_entitlement) { %>
<span class="run-period"><%- dateString %></span> <span class="run-period"><%- dateString %></span>
<% if (user_entitlement && !user_entitlement.expired_at && !is_unfulfilled_entitlement) { %> <% if (user_entitlement && !user_entitlement.expired_at && !is_unfulfilled_entitlement) { %>
<button class="change-session btn-link" aria-controls="change-session-<%-user_entitlement.uuid%>"> <%- gettext('Change Session')%></button> <button class="change-session btn-link" aria-controls="change-session-<%-user_entitlement.uuid%>"> <%- gettext('Change or Leave Session')%></button>
<% } %> <% } %>
<% } %> <% } %>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment