Merge pull request #23063 from edx/ddumesnil/revert-AA-4

Revert commits for AA-4

openedx/core/djangoapps/schedules/resolvers.py

@@ -14,7 +14,7 @@ from edx_ace.recipient import Recipient
 from edx_ace.recipient_resolver import RecipientResolver
 from edx_django_utils.monitoring import function_trace, set_custom_metric
 
-from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
+from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
 from lms.djangoapps.discussion.notification_prefs.views import UsernameCipher
 from openedx.core.djangoapps.ace_common.template_context import get_base_template_context
 from openedx.core.djangoapps.schedules.config import COURSE_UPDATE_SHOW_UNSUBSCRIBE_WAFFLE_SWITCH

openedx/features/course_duration_limits/access.py

@@ -17,7 +17,7 @@ from web_fragments.fragment import Fragment
 from course_modes.models import CourseMode
 from lms.djangoapps.courseware.access_response import AccessError
 from lms.djangoapps.courseware.access_utils import ACCESS_GRANTED
-from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link
+from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link
 from lms.djangoapps.courseware.masquerade import get_course_masquerade, is_masquerading_as_specific_student
 from openedx.core.djangoapps.catalog.utils import get_course_run_details
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview

openedx/features/course_experience/templates/course_experience/dates-summary.html

@@ -2,24 +2,26 @@
 from django.utils.translation import ugettext as _
 %>
 <%page args="course_date" expression_filter="h"/>
-<div class="date-summary date-summary-${course_date.css_class}">
-    <div class="left-column">
-        <div class="calendar-icon"></div>
-    </div>
-    <div class="right-column">
-        % if course_date.date:
-            <p class="hd hd-6 date localized-datetime" data-format="shortDate" data-datetime="${course_date.date}" data-timezone="${user_timezone}" data-language="${user_language}"></p>
-        % endif
-        % if course_date.title:
-            <div class="hd hd-6 heading">${course_date.title}</div>
-        % endif
-        % if course_date.description:
-            <p class="description">${course_date.description}</p>
-        % endif
-        % if course_date.link and course_date.link_text:
-            <div class="date-summary-link">
-                <a href="${course_date.link}">${course_date.link_text}</a>
-            </div>
-        % endif
+<div class="date-summary-container">
+    <div class="date-summary date-summary-${course_date.css_class}">
+        <div class="left-column">
+            <div class="calendar-icon"></div>
+        </div>
+        <div class="right-column">
+            % if course_date.date:
+                <p class="hd hd-6 date localized-datetime" data-format="shortDate" data-datetime="${course_date.date}" data-timezone="${user_timezone}" data-language="${user_language}"></p>
+            % endif
+            % if course_date.title:
+                <span class="hd hd-6 heading">${course_date.title}</span>
+            % endif
+            % if course_date.description:
+                <p class="description">${course_date.description}</p>
+            % endif
+            % if course_date.link and course_date.link_text:
+                <span class="date-summary-link">
+                    <a href="${course_date.link}">${course_date.link_text}</a>
+                </span>
+            % endif
+        </div>
     </div>
 </div>

openedx/features/course_experience/tests/views/test_course_home.py

@@ -25,7 +25,7 @@ from experiments.models import ExperimentData
 from lms.djangoapps.commerce.models import CommerceConfiguration
 from lms.djangoapps.commerce.utils import EcommerceService
 from lms.djangoapps.course_goals.api import add_course_goal, remove_course_goal
-from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link
+from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link
 from lms.djangoapps.courseware.tests.factories import (
     BetaTesterFactory,
     GlobalStaffFactory,
@@ -218,7 +218,7 @@ class TestCourseHomePage(CourseHomePageTestCase):
 
         # Fetch the view and verify the query counts
         # TODO: decrease query count as part of REVO-28
-        with self.assertNumQueries(76, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(74, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
             with check_mongo_calls(4):
                 url = course_home_url(self.course)
                 self.client.get(url)

openedx/features/course_experience/views/course_dates.py

@@ -25,7 +25,7 @@ class CourseDatesFragmentView(EdxFragmentView):
         """
         course_key = CourseKey.from_string(course_id)
         course = get_course_with_access(request.user, 'load', course_key, check_if_enrolled=False)
-        course_date_blocks = get_course_date_blocks(course, request.user, request, num_assignments=2)
+        course_date_blocks = get_course_date_blocks(course, request.user)
 
         context = {
             'course_date_blocks': [block for block in course_date_blocks if block.title != 'current_datetime']

openedx/features/course_experience/views/course_sock.py

@@ -6,7 +6,7 @@ Fragment for rendering the course's sock and associated toggle button.
 from django.template.loader import render_to_string
 from web_fragments.fragment import Fragment
 
-from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
+from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.features.discounts.utils import format_strikeout_price
 from student.models import CourseEnrollment

openedx/features/discounts/utils.py

@@ -11,7 +11,7 @@ from edx_django_utils.cache import RequestCache
 import pytz
 
 from course_modes.models import get_course_prices, format_course_price
-from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link
+from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from experiments.models import ExperimentData