Vue/padv 1558

.github/pull_request_template.md

@@ -1,20 +1,3 @@
-<!--
-
-🌰🌰
-🌰🌰🌰🌰         🌰 Note: the Nutmeg master branch has been created.  Please consider whether your change
-    🌰🌰🌰🌰     should also be applied to Nutmeg. If so, make another pull request against the
-🌰🌰🌰🌰         open-release/nutmeg.master branch, or ping @nedbat for help or questions.
-🌰🌰
-
-Please give your pull request a short but descriptive title.
-Use conventional commits to separate and summarize commits logically:
-https://open-edx-proposals.readthedocs.io/en/latest/oep-0051-bp-conventional-commits.html
-
-Use this template as a guide. Omit sections that don't apply. You may link to information rather than copy it.
-More details about the template are at https://github.com/openedx/open-edx-proposals/pull/180
-(link will be updated when that document merges)
--->
-
 ## Description
 
 Describe what this pull request changes, and why. Include implications for people using this change.

.github/workflows/build-push-image-main.yml

@@ -0,0 +1,38 @@
+name: Tutor Build Action
+
+on:
+  push:
+    branches:
+      - 'pearson-release/olive.main'
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Get current time
+        uses: josStorer/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD-HH-mm
+
+      - name: Build and push Image
+        uses: Pearson-Advance/[email protected]
+        with:
+          python-version: ${{ vars.BUILD_PYTHON_VERSION }}
+          tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
+          path-image-to-be-built: 'env/build/openedx'
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
+          image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-${{ steps.current-time.outputs.formattedTime }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
+          gh-access-token: ${{ secrets.GH_PAT }}
+          theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
+          theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-edxapp-prod'
+          extra-private-requirements: true
+          private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
+          branches: ${{ vars.BUILD_BRANCHES }}

.github/workflows/build-push-image-stage.yml

@@ -0,0 +1,38 @@
+name: Tutor Build Action Test
+
+on:
+  push:
+    branches:
+      - 'pearson-release/olive.stage'
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Get current time
+        uses: josStorer/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYY-MM-DD-HH-mm
+
+      - name: Build and push Image
+        uses: Pearson-Advance/[email protected]
+        with:
+          python-version: ${{ vars.BUILD_PYTHON_VERSION }}
+          tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
+          path-image-to-be-built: 'env/build/openedx'
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
+          image-tag: ${{ vars.BUILD_TUTOR_VERSION }}-RC-${{ steps.current-time.outputs.formattedTime }}
+          docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
+          gh-access-token: ${{ secrets.GH_PAT }}
+          theme-repository: ${{ vars.BUILD_THEME_REPOSITORY }}
+          theme-branch: ${{ vars.BUILD_THEME_BRANCH }}
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-edxapp-stg'
+          extra-private-requirements: true
+          private-repositories: ${{ vars.BUILD_PRIVATE_REPOSITORIES }}
+          branches: ${{ vars.BUILD_BRANCHES }}

.github/workflows/unit-tests-gh-hosted.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   run-test:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -31,7 +31,7 @@ jobs:
             "cms-2",
             "common-1",
             "common-2",
-            "common-3",
+            "xmodule-1"
         ]
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
@@ -75,7 +75,7 @@ jobs:
         uses: ./.github/actions/unit-tests
 
   collect-and-verify:
-    if: github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private'
+    if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true))
     runs-on: ubuntu-20.04
     strategy:
       matrix:

.github/workflows/unit-tests.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   run-tests:
     name: python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     strategy:
       matrix:
@@ -80,7 +80,7 @@ jobs:
   # https://github.com/orgs/community/discussions/33579
   success:
     name: Tests successful
-    if: always()
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     needs:
       - run-tests
     runs-on: ubuntu-latest

.github/workflows/verify-gha-unit-tests-count.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   collect-and-verify:
-    if: github.repository == 'openedx/edx-platform' || github.repository == 'edx/edx-platform-private'
+    if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false))
     runs-on: [ edx-platform-runner ]
     steps:
       - name: sync directory owner

.tx/config

@@ -67,3 +67,14 @@ source_file = conf/locale/en/LC_MESSAGES/wiki.po
 source_lang = en
 type        = PO
 
+[o:open-edx:p:open-edx-releases:r:release-olive]
+file_filter = conf/locale/<lang>/LC_MESSAGES/django.po
+source_file = conf/locale/en/LC_MESSAGES/django.po
+source_lang = en
+type = PO
+
+[o:open-edx:p:open-edx-releases:r:release-olive-js]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs.po
+source_lang = en
+type = PO

cms/djangoapps/contentstore/signals/handlers.py

@@ -134,7 +134,10 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
 
     if key_supports_outlines(course_key):
         # Push the course outline to learning_sequences asynchronously.
-        update_outline_from_modulestore_task.delay(course_key_str)
+        update_outline_from_modulestore_task.apply_async(
+            args=[course_key_str],
+            countdown=settings.BLOCK_STRUCTURES_SETTINGS.get('COURSE_PUBLISH_TASK_DELAY', 30),
+        )
 
     if settings.COURSEGRAPH_DUMP_COURSE_ON_PUBLISH:
         # Push the course out to CourseGraph asynchronously.
@@ -145,7 +148,10 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
     if CoursewareSearchIndexer.indexing_is_enabled() and CourseAboutSearchIndexer.indexing_is_enabled():
         update_search_index.delay(course_key_str, datetime.now(UTC).isoformat())
 
-    update_discussions_settings_from_course_task.delay(course_key_str)
+    update_discussions_settings_from_course_task.apply_async(
+        args=[course_key_str],
+        countdown=settings.DISCUSSION_SETTINGS['COURSE_PUBLISH_TASK_DELAY'],
+    )
 
     # Send to a signal for catalog info changes as well, but only once we know the transaction is committed.
     transaction.on_commit(lambda: emit_catalog_info_changed_signal(course_key))

cms/djangoapps/contentstore/views/component.py

@@ -538,6 +538,11 @@ def component_handler(request, usage_key_string, handler, suffix=''):
     """
     usage_key = UsageKey.from_string(usage_key_string)
 
+    # Addendum:
+    # TNL 101-62 studio write permission is also checked for editing content.
+
+    if handler == 'submit_studio_edits' and not has_course_author_access(request.user, usage_key.course_key):
+        raise PermissionDenied("No studio write Permissions")
     # Let the module handle the AJAX
     req = django_to_webob_request(request)
 

cms/djangoapps/contentstore/views/course.py

@@ -30,7 +30,7 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import BlockUsageLocator
-from organizations.api import add_organization_course, ensure_organization
+from organizations.api import add_organization_course, ensure_organization, get_organizations
 from organizations.exceptions import InvalidOrganizationException
 from rest_framework.exceptions import ValidationError
 
@@ -537,7 +537,13 @@ def course_listing(request):
 
     optimization_enabled = GlobalStaff().has_user(request.user) and ENABLE_GLOBAL_STAFF_OPTIMIZATION.is_enabled()
 
-    org = request.GET.get('org', '') if optimization_enabled else None
+    org = None
+    org_names_list = []
+
+    if optimization_enabled:
+        org = request.GET.get('org') if request.GET.get('org') else None
+        org_names_list = [(org['short_name']) for org in get_organizations() if 'short_name' in org]
+
     courses_iter, in_process_course_actions = get_courses_accessible_to_user(request, org)
     user = request.user
     libraries = []
@@ -586,7 +592,8 @@ def format_in_process_course_view(uca):
         'allow_unicode_course_id': settings.FEATURES.get('ALLOW_UNICODE_COURSE_ID', False),
         'allow_course_reruns': settings.FEATURES.get('ALLOW_COURSE_RERUNS', True),
         'optimization_enabled': optimization_enabled,
-        'active_tab': 'courses'
+        'active_tab': 'courses',
+        'org_names_list': org_names_list,
     })