|
58 | 58 | from openedx.core.djangolib.markup import HTML, Text |
59 | 59 | from openedx.features.content_type_gating.models import ContentTypeGatingConfig |
60 | 60 | from openedx.features.course_duration_limits.access import get_user_course_duration, get_user_course_expiration_date |
61 | | -from openedx.features.enterprise_support.api import ( |
62 | | - get_dashboard_consent_notification, |
63 | | - get_enterprise_learner_portal_context, |
64 | | -) |
65 | | -from openedx.features.enterprise_support.utils import is_enterprise_learner |
66 | 61 | from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order |
67 | 62 |
|
68 | 63 | log = logging.getLogger("edx.student") |
@@ -619,7 +614,7 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem |
619 | 614 | link_end=HTML("</a>"), |
620 | 615 | ) |
621 | 616 |
|
622 | | - enterprise_message = get_dashboard_consent_notification(request, user, course_enrollments) |
| 617 | + enterprise_message = '' |
623 | 618 |
|
624 | 619 | recovery_email_message = recovery_email_activation_message = None |
625 | 620 | if is_secondary_email_feature_enabled(): |
@@ -647,10 +642,6 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem |
647 | 642 | ) |
648 | 643 | ) |
649 | 644 |
|
650 | | - # Disable lookup of Enterprise consent_required_course due to ENT-727 |
651 | | - # Will re-enable after fixing WL-1315 |
652 | | - consent_required_courses = set() |
653 | | - |
654 | 645 | # Account activation message |
655 | 646 | account_activation_messages = [ |
656 | 647 | message for message in messages.get_messages(request) if 'account-activation' in message.tags |
@@ -802,7 +793,7 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem |
802 | 793 | 'urls': urls, |
803 | 794 | 'programs_data': programs_data, |
804 | 795 | 'enterprise_message': enterprise_message, |
805 | | - 'consent_required_courses': consent_required_courses, |
| 796 | + 'consent_required_courses': set(), |
806 | 797 | 'enrollment_message': enrollment_message, |
807 | 798 | 'redirect_message': Text(redirect_message), |
808 | 799 | 'account_activation_messages': account_activation_messages, |
@@ -852,14 +843,8 @@ def student_dashboard(request): # lint-amnesty, pylint: disable=too-many-statem |
852 | 843 | 'course_info': get_dashboard_course_info(user, course_enrollments), |
853 | 844 | # TODO START: clean up as part of REVEM-199 (END) |
854 | 845 | 'disable_unenrollment': disable_unenrollment, |
855 | | - # TODO: clean when experiment(Merchandise 2U LOBs - Dashboard) would be stop. [VAN-1097] |
856 | | - 'is_enterprise_user': is_enterprise_learner(user), |
857 | 846 | } |
858 | 847 |
|
859 | | - # Include enterprise learner portal metadata and messaging |
860 | | - enterprise_learner_portal_context = get_enterprise_learner_portal_context(request) |
861 | | - context.update(enterprise_learner_portal_context) |
862 | | - |
863 | 848 | context_from_plugins = get_plugins_view_context( |
864 | 849 | ProjectType.LMS, |
865 | 850 | COURSE_DASHBOARD_PLUGIN_VIEW_NAME, |
|
0 commit comments