From 377dec74aa2cf1218579dfa717e6cd6d24e4aa6e Mon Sep 17 00:00:00 2001 From: Ahtisham Shahid Date: Fri, 20 Aug 2021 12:44:40 +0500 Subject: [PATCH] feat: Added pages&resources url to missing pages (#28472) * feat: Removed extra pages by using waffle flag * refactor:moved pages_and_resources_url context in header file * refactor: cleanup of header file * refactor: removed redundant instances of mfe url from context * fix: fixed pylint issues --- .../contentstore/views/certificates.py | 2 -- .../contentstore/views/checklists.py | 3 +-- cms/djangoapps/contentstore/views/course.py | 6 ------ cms/templates/widgets/header.html | 19 ++++++++++++------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/cms/djangoapps/contentstore/views/certificates.py b/cms/djangoapps/contentstore/views/certificates.py index 4e6a453bcd..56f974f995 100644 --- a/cms/djangoapps/contentstore/views/certificates.py +++ b/cms/djangoapps/contentstore/views/certificates.py @@ -49,7 +49,6 @@ from xmodule.modulestore.django import modulestore from ..exceptions import AssetNotFoundException from ..utils import ( get_lms_link_for_certificate_web_view, - get_pages_and_resources_url, get_proctored_exam_settings_url, reverse_course_url ) @@ -430,7 +429,6 @@ def certificates_list_handler(request, course_key_string): 'is_global_staff': GlobalStaff().has_user(request.user), 'certificate_activation_handler_url': activation_handler_url, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course.id), }) elif "application/json" in request.META.get('HTTP_ACCEPT'): # Retrieve the list of certificates for the specified course diff --git a/cms/djangoapps/contentstore/views/checklists.py b/cms/djangoapps/contentstore/views/checklists.py index 7149d57797..d9a440200a 100644 --- a/cms/djangoapps/contentstore/views/checklists.py +++ b/cms/djangoapps/contentstore/views/checklists.py @@ -6,7 +6,7 @@ from opaque_keys.edx.keys import CourseKey from common.djangoapps.edxmako.shortcuts import render_to_response from common.djangoapps.student.auth import has_course_author_access -from cms.djangoapps.contentstore.utils import get_pages_and_resources_url, get_proctored_exam_settings_url +from cms.djangoapps.contentstore.utils import get_proctored_exam_settings_url from xmodule.modulestore.django import modulestore __all__ = ['checklists_handler'] @@ -32,5 +32,4 @@ def checklists_handler(request, course_key_string=None): 'language_code': request.LANGUAGE_CODE, 'context_course': course_module, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 2c63c50c43..44ea5c58bb 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -96,7 +96,6 @@ from ..toggles import split_library_view_on_dashboard from ..utils import ( add_instructor, get_lms_link_for_item, - get_pages_and_resources_url, get_proctored_exam_settings_url, initialize_permissions, remove_all_instructors, @@ -728,7 +727,6 @@ def course_index(request, course_key): 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), 'advance_settings_url': reverse_course_url('advanced_settings_handler', course_module.id), 'proctoring_errors': proctoring_errors, - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) @@ -1165,7 +1163,6 @@ def settings_handler(request, course_key_string): # lint-amnesty, pylint: disab 'enable_extended_course_details': enable_extended_course_details, 'upgrade_deadline': upgrade_deadline, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), } if is_prerequisite_courses_enabled(): courses, in_process_course_actions = get_courses_accessible_to_user(request) @@ -1286,7 +1283,6 @@ def grading_handler(request, course_key_string, grader_index=None): 'grading_url': reverse_course_url('grading_handler', course_key), 'is_credit_course': is_credit_course(course_key), 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), }) elif 'application/json' in request.META.get('HTTP_ACCEPT', ''): if request.method == 'GET': @@ -1392,7 +1388,6 @@ def advanced_settings_handler(request, course_key_string): 'advanced_settings_url': reverse_course_url('advanced_settings_handler', course_key), 'publisher_enabled': publisher_enabled, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_module.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course_module.id), 'proctoring_errors': proctoring_errors, }) elif 'application/json' in request.META.get('HTTP_ACCEPT', ''): @@ -1745,7 +1740,6 @@ def group_configurations_list_handler(request, course_key_string): 'all_group_configurations': displayable_partitions, 'should_show_enrollment_track': should_show_enrollment_track, 'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course.id), - 'pages_and_resources_mfe_link': get_pages_and_resources_url(course.id), }) elif "application/json" in request.META.get('HTTP_ACCEPT'): if request.method == 'POST': diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 5bb4e3313e..e0be8f62d3 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -7,11 +7,12 @@ from django.urls import reverse from django.utils.translation import ugettext as _ from cms.djangoapps.contentstore import toggles + from cms.djangoapps.contentstore.utils import get_pages_and_resources_url + from openedx.core.djangoapps.discussions.config.waffle import ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_enabled, released_languages %>