diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py index 5b62815f06..f06df135a3 100644 --- a/openedx/features/enterprise_support/api.py +++ b/openedx/features/enterprise_support/api.py @@ -836,7 +836,7 @@ def get_enterprise_course_enrollments(user): """ return EnterpriseCourseEnrollment.objects.select_related( - 'licensedenterprisecourseenrollment_enrollment_fulfillment', + 'licensed_with', 'enterprise_customer_user' ).prefetch_related( 'enterprise_customer_user__enterprise_customer' diff --git a/openedx/features/enterprise_support/context.py b/openedx/features/enterprise_support/context.py index 540cfb7998..f4f090f8fa 100644 --- a/openedx/features/enterprise_support/context.py +++ b/openedx/features/enterprise_support/context.py @@ -1,7 +1,10 @@ """ APIs providing enterprise context for events. """ -from enterprise.models import EnterpriseCourseEnrollment +try: + from enterprise.models import EnterpriseCourseEnrollment +except ImportError: # pragma: no cover + pass def get_enterprise_event_context(user_id, course_id): diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 7f6a611fa5..7ba81c3cc4 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,7 +25,7 @@ django-storages<1.9 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.61.0 +edx-enterprise==3.60.21 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c088c80fdf..0bf0b2816a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -472,7 +472,7 @@ edx-drf-extensions==8.4.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.61.0 +edx-enterprise==3.60.21 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b0d109b891..fd215779cd 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -595,7 +595,7 @@ edx-drf-extensions==8.4.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.61.0 +edx-enterprise==3.60.21 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index f65661146f..f5637f5ff2 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -574,7 +574,7 @@ edx-drf-extensions==8.4.1 # edx-when # edxval # learner-pathway-progress -edx-enterprise==3.61.0 +edx-enterprise==3.60.21 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt