From c67b6980f69fed5762cbf56f2e91736b9595cb96 Mon Sep 17 00:00:00 2001 From: Maham Akif Date: Thu, 26 Sep 2024 16:12:12 +0500 Subject: [PATCH 1/2] chore: revert learner pathway skeleton implementation (#30355) --- .github/workflows/pylint-checks.yml | 2 +- openedx/core/djangoapps/learner_pathway/__init__.py | 0 openedx/core/djangoapps/learner_pathway/admin.py | 3 --- openedx/core/djangoapps/learner_pathway/apps.py | 12 ------------ .../learner_pathway/migrations/__init__.py | 0 openedx/core/djangoapps/learner_pathway/models.py | 3 --- .../djangoapps/learner_pathway/tests/__init__.py | 0 openedx/core/djangoapps/learner_pathway/views.py | 3 --- 8 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 openedx/core/djangoapps/learner_pathway/__init__.py delete mode 100644 openedx/core/djangoapps/learner_pathway/admin.py delete mode 100644 openedx/core/djangoapps/learner_pathway/apps.py delete mode 100644 openedx/core/djangoapps/learner_pathway/migrations/__init__.py delete mode 100644 openedx/core/djangoapps/learner_pathway/models.py delete mode 100644 openedx/core/djangoapps/learner_pathway/tests/__init__.py delete mode 100644 openedx/core/djangoapps/learner_pathway/views.py diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 58560bf307..144cc77a3d 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -20,7 +20,7 @@ jobs: - module-name: openedx-1 path: "--django-settings-module=lms.envs.test openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/" - module-name: openedx-2 - path: "--django-settings-module=lms.envs.test openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/learner_pathway/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/" + path: "--django-settings-module=lms.envs.test openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/" - module-name: common path: "--django-settings-module=lms.envs.test common pavelib" - module-name: cms diff --git a/openedx/core/djangoapps/learner_pathway/__init__.py b/openedx/core/djangoapps/learner_pathway/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openedx/core/djangoapps/learner_pathway/admin.py b/openedx/core/djangoapps/learner_pathway/admin.py deleted file mode 100644 index f69e12dccd..0000000000 --- a/openedx/core/djangoapps/learner_pathway/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Admin interface for learner_pathway App. -""" diff --git a/openedx/core/djangoapps/learner_pathway/apps.py b/openedx/core/djangoapps/learner_pathway/apps.py deleted file mode 100644 index 101ffd5570..0000000000 --- a/openedx/core/djangoapps/learner_pathway/apps.py +++ /dev/null @@ -1,12 +0,0 @@ -""" -Configuration for learner_pathway Django app -""" - -from django.apps import AppConfig -from django.utils.translation import gettext_lazy as _ - - -class LearnerPathwayConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'learner_pathway' - verbose_name = _("Learner Pathways") diff --git a/openedx/core/djangoapps/learner_pathway/migrations/__init__.py b/openedx/core/djangoapps/learner_pathway/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openedx/core/djangoapps/learner_pathway/models.py b/openedx/core/djangoapps/learner_pathway/models.py deleted file mode 100644 index a03ee95ad3..0000000000 --- a/openedx/core/djangoapps/learner_pathway/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Models for learner_pathway App. -""" diff --git a/openedx/core/djangoapps/learner_pathway/tests/__init__.py b/openedx/core/djangoapps/learner_pathway/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openedx/core/djangoapps/learner_pathway/views.py b/openedx/core/djangoapps/learner_pathway/views.py deleted file mode 100644 index 8a87b81297..0000000000 --- a/openedx/core/djangoapps/learner_pathway/views.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Views for learner_pathway App. -""" From 888d85c9649db37e7e91a065ca440794f210a1b1 Mon Sep 17 00:00:00 2001 From: Muhammad Adeel Tajamul <77053848+muhammadadeeltajamul@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:10:42 -0700 Subject: [PATCH 2/2] fix: added ace_enabled in bulk_email logs (#35558) --- lms/djangoapps/bulk_email/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py index 184dfd0e68..dc11894953 100644 --- a/lms/djangoapps/bulk_email/tasks.py +++ b/lms/djangoapps/bulk_email/tasks.py @@ -457,7 +457,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas log.info( f"BulkEmail ==> Task: {parent_task_id}, SubTask: {task_id}, EmailId: {email_id}, " - f"TotalRecipients: {total_recipients}" + f"TotalRecipients: {total_recipients}, ace_enabled: {is_bulk_email_edx_ace_enabled()}" ) try: