fix: fix issues with cherry-pick

cms/djangoapps/contentstore/views/course.py

@@ -32,6 +32,7 @@
 from opaque_keys.edx.locator import BlockUsageLocator
 from organizations.api import add_organization_course, ensure_organization
 from organizations.exceptions import InvalidOrganizationException
+from organizations.models import Organization
 from rest_framework.exceptions import ValidationError
 
 from cms.djangoapps.course_creators.views import add_user_with_status_unrequested, get_course_creator_status
@@ -81,7 +82,6 @@
 from openedx.features.content_type_gating.partitions import CONTENT_TYPE_GATING_SCHEME
 from openedx.features.course_experience.waffle import ENABLE_COURSE_ABOUT_SIDEBAR_HTML
 from openedx.features.course_experience.waffle import waffle as course_experience_waffle
-from organizations.models import Organization
 from xmodule.contentstore.content import StaticContent  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.course_module import CourseBlock, DEFAULT_START_DATE, CourseFields  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.error_module import ErrorBlock  # lint-amnesty, pylint: disable=wrong-import-order

cms/djangoapps/contentstore/views/tests/test_course_index.py

@@ -406,10 +406,10 @@ def check_index_page(self, separate_archived_courses, org):
         (True, 'staff', None, 0, 21),
         (False, 'staff', None, 0, 21),
         # Base user has global staff access
-        (True, 'user', ORG, 2, 21),
-        (False, 'user', ORG, 2, 21),
-        (True, 'user', None, 2, 21),
-        (False, 'user', None, 2, 21),
+        (True, 'user', ORG, 1, 21),
+        (False, 'user', ORG, 1, 21),
+        (True, 'user', None, 1, 21),
+        (False, 'user', None, 1, 21),
     )
     @ddt.unpack
     def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries):