raccoongang · andrii-hantkovskyi · May 15, 2023 · Jun 28, 2023 · Jul 14, 2023 · Jul 25, 2023
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: python:latest
 stages:
   - quality
   - conventions
+  - deploy
 
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -38,15 +39,20 @@ lint:
 
 commit_convention:
   stage: conventions
-  image: node:16
+  before_script: []
+  image:
+    name: auterion/commitlint
+    entrypoint: [""]
   needs: []
-  cache:
-    key: commitlint-node_modules
-    paths:
-      - node_modules/
-  before_script:
-    - bash -c "[[ -d node_modules/ ]] || npm install @commitlint/cli @commitlint/config-conventional; exit 0;"
   script:
-    - npx --quiet commitlint --from="$CI_MERGE_REQUEST_DIFF_BASE_SHA" --help-url 'https://raccoongang.atlassian.net/wiki/spaces/PSC/pages/2662006787/RG+Delivery+Solutions+Conventional+Commits'
+    - commitlint
+      --from="$CI_MERGE_REQUEST_DIFF_BASE_SHA"
+      --help-url 'https://raccoongang.atlassian.net/wiki/spaces/PSC/pages/2662006787/RG+Delivery+Solutions+Conventional+Commits'
   rules:
     - if: "$CI_MERGE_REQUEST_EVENT_TYPE != 'merge_train' && $CI_MERGE_REQUEST_DIFF_BASE_SHA"
+
+deploy-dev:
+    stage: deploy
+    trigger: hippoteam/aspen-courses/deployment
+    only:
+      - "main"
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
@@ -1,27 +1,35 @@
-**Description:**
+## Description:
 
 A few sentences describing the overall goals of `merge request`.
 
-**Youtrack:**
+## Definition of Readiness (DoR):
+Use the DRAFT status if there any blockers.
+List any blockers for the review/merge here.
+
+- [ ] 
+
+## Youtrack:
 
 https://youtrack.raccoongang.com/issue/XXXXX
 
-**Configuration instructions:**
+## Configuration instructions:
 
 List any non-trivial configuration instructions (if any).
 
-**Reviewers:**
+## Reviewers:
 - [ ] @idegtiarov
 - [ ] @dyudyunov
+- [ ] @alipov_dmytro
 
 
-**Related Confluence|Other documents:**
+## Related Confluence|Other documents:
 - < URL to Confluence document 1 >
 - < URL to Confluence document 2 >
 
-**Pre-Merge Checklist:**
+## Pre-Merge Checklist:
 
 - [ ] Demo status: OK
+- [ ] DoRs are closed
 - [ ] All related documentation is updated
   - [ ] Described your changes in RG_CHANGELOG.rst
   base changlog on https://keepachangelog.com/en/1.0.0/
@@ -32,5 +40,5 @@ List any non-trivial configuration instructions (if any).
 - [ ] Confirmed Gitlab reports all automated tests/checks are passing.
 - [ ] Approved by at least one additional reviewer.
 
-**Post merge:**
+## Post merge:
 - [ ] Delete the working branch (if not needed anymore)
diff --git a/RG_CHANGELOG.rst b/RG_CHANGELOG.rst
@@ -8,10 +8,54 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`
 [Unreleased]
 ************
 
+[palm-rg.3] 2024-02-12
+**********************
+
+Changed
+=======
+
+* Upgrade django version to apply security patches `RGOeX-263464 https://youtrack.raccoongang.com/issue/RGOeX-26364`_
+* Update the MR template with DoR section `OX-3406 https://youtrack.raccoongang.com/issue/OX-3406`_
+
+[palm-rg.2] 2023-12-01
+**********************
+
+Sync:
+=====
+Update on upstream open-release/palm.4
+
+Changed
+=======
+
+* Added ability to add social links with params in profile `RGOeX-26082 <https://youtrack.raccoongang.com/issue/RGOeX-26082>`_
+
+  * Changes should be reverted when upstream PR is merged (`master#33565 <https://github.com/openedx/edx-platform/pull/33565>`_, `quince#33610 <https://github.com/openedx/edx-platform/pull/33610>`_)
+
+* "Twitter.com" changed to "x.com" `RGOeX-26082 <https://youtrack.raccoongang.com/issue/RGOeX-26083>`_
+
+  * Must be dropped when `Upstream MR <https://github.com/openedx/edx-platform/pull/33613>`_ is merged.
+
+[palm-rg.1] 2023-11-03 (Palm RG release)
+****************************************
+
+Changed
+=======
+
+* Overridden view for validate user full name length `RGOeX-26076 <https://youtrack.raccoongang.com/issue/RGOeX-26076>`_
+
+  * Should be dropped when upstream PR (`master#33501 <https://github.com/openedx/edx-platform/pull/33501>`_, `quince#33615 <https://github.com/openedx/edx-platform/pull/33615>`_) will be merged
+* Overridden view for disable user count caching `RGOeX-26145 <https://youtrack.raccoongang.com/issue/RGOeX-26145>`_
+
+  * Should be dropped when upstream PR (`master <https://github.com/openedx/edx-platform/pull/33617>`_, `quince <https://github.com/openedx/edx-platform/pull/33618>`_) will be merged
+
+* Overridden view for adding EdX Info Pages `RGOeX-26048 <https://youtrack.raccoongang.com/issue/RGOeX-26048>`_
+* Updated doc link for programms `RGOeX-26017 <https://youtrack.raccoongang.com/issue/RGOeX-26017>`_
+
 Fixes
 =====
 
-* Fix cleaned version of the thread's body in the preview_body `RGOeX-25633 <https://youtrack.raccoongang.com/issue/RGOeX-25633>`_
+* Hot fix validation error for "empty" Batch Enrollment and "empty" Batch Beta Tester Addition (deployment error related to ES6) `RGOeX-25965 <https://youtrack.raccoongang.com/issue/RGOeX-25965>`_
+* Fix validation error for "empty" Batch Enrollment and "empty" Batch Beta Tester Addition `RGOeX-25965 <https://youtrack.raccoongang.com/issue/RGOeX-25965>`_
 
 Added
 =====
@@ -31,7 +75,6 @@ Fixes
 
   * This commit should be skipped when we start the sync process with the Quince branch if the `master PR <https://github.com/openedx/edx-platform/pull/31668>`_ will be merged by then
 
-* Fix for the course overview editing field in the Studio
 * Course search used wrong import, so search results were empty on the Discover New page.
   Fixed import, removed duplicated exclude_dictionary values
 
@@ -44,17 +87,9 @@ Changed
 * RG-LMS gitlab MR template renamed to the Default template, some minor
   changes to the template were also added.
 
-* Remove RG-specific settings that were moved to deployment `RGOeX-1713 <https://youtrack.raccoongang.com/issue/RGOeX-1713>`_
-
-  * This reverts changes from the `RGOeX-687 <https://youtrack.raccoongang.com/issue/RGOeX-687>`_
-
 Added
 =====
 
-* Add modified favicon redirect view to be able to use the themed version `RGOeX-771 <https://youtrack.raccoongang.com/issue/RGOeX-771>`_ `RGOeX-1564 <https://youtrack.raccoongang.com/issue/RGOeX-1564>`_
-
-  * This requires modifications in nginx configurations because favicon url was redifined there for some reason
-
 * Add ability to notify Credentials about received honor course certificate `RGOeX-1413 <https://youtrack.raccoongang.com/issue/RGOeX-1413>`_
 
   * Added the new WaffleFlag `course_modes.extend_certificate_relevant_modes_with_honor`
@@ -64,8 +99,6 @@ Added
 Fixes
 =====
 
-* Fix error for the CMS logistration `RGOeX-1597 <https://youtrack.raccoongang.com/issue/RGOeX-1597>`_
-
 * Fix empty signature added after every certificate saving `RGOeX-1659 <https://youtrack.raccoongang.com/issue/RGOeX-1659>`_
 
 
@@ -79,12 +112,6 @@ Fixes
   * pass the right site to the email context
   * https://youtrack.raccoongang.com/issue/RGOeX-933
 
-[Feature] - 2022-02-15
-~~~~~~~~~~~~~~~~~~
-* Add default xblock to the requirements
-
-  * https://youtrack.raccoongang.com/issue/RGOeX-935
-
 [Fix] - 2022-02-15
 ~~~~~~~~~~~~~~~~~~
 * Fix text mistakes on the cookie policy page
@@ -97,21 +124,10 @@ Fixes
   * `ProgramsApiConfig` doesn’t have the marketing path by default
   * removed the `--site-domain` arg, updating site configurations for all sites instead
 
-[Fix] - 2022-02-02
-~~~~~~~~~~~~~~~~~~
-* Add settings needed for the Studio SSO logins
-
-  * Details: https://youtrack.raccoongang.com/issue/RGOeX-687
-
 [Fix] - 2022-01-28
-~~~~~~~~~~~~~~~~~~
 * Avoid django loaders template caching
 * Account activation email site logo theming fix
-  * Details: https://youtrack.raccoongang.com/issue/RGOeX-411
-* Keep localize course dates after user logout
-  * Details: https://youtrack.raccoongang.com/issue/RGOeX-609
-  * Upstream MR to master https://github.com/openedx/edx-platform/pull/29772
-  * Upstream MR to open-release/maple.master https://github.com/openedx/edx-platform/pull/29773
+* Details: https://youtrack.raccoongang.com/issue/RGOeX-411
 
 [Fix] - 2022-01-26
 ~~~~~~~~~~~~~~~~~~
@@ -155,10 +171,6 @@ Fixes
 ~~~~~~~~~~~~~~~~
 ‘enable_programs’ command is added.
 
-[Fix] 2021-04-26
-~~~~~~~~~~~~~~~~
-‘Linked accounts’ tab is hidden if there are no SSO provider are installed
-
 [Documentation|Enhancement] - 2021-02-24
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * RG_CHANGELOG is added!

diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
@@ -53,7 +53,8 @@
     CourseInstructorRole,
     CourseStaffRole,
     GlobalStaff,
-    UserBasedRole
+    UserBasedRole,
+    OrgStaffRole
 )
 from common.djangoapps.util.course import get_link_for_about_page
 from common.djangoapps.util.date_utils import get_default_time_display
@@ -597,6 +598,7 @@ def format_in_process_course_view(uca):
         'optimization_enabled': optimization_enabled,
         'active_tab': 'courses',
         'allowed_organizations': get_allowed_organizations(user),
+        'allowed_organizations_for_libraries': get_allowed_organizations_for_libraries(user),
         'can_create_organizations': user_can_create_organizations(user),
     })
 
@@ -624,6 +626,7 @@ def library_listing(request):
         'split_studio_home': split_library_view_on_dashboard(),
         'active_tab': 'libraries',
         'allowed_organizations': get_allowed_organizations(request.user),
+        'allowed_organizations_for_libraries': get_allowed_organizations_for_libraries(request.user),
         'can_create_organizations': user_can_create_organizations(request.user),
     }
     return render_to_response('index.html', data)
@@ -1943,13 +1946,37 @@ def get_allowed_organizations(user):
         return []
 
 
+def get_allowed_organizations_for_libraries(user):
+    """
+    Helper method for returning the list of organizations for which the user is allowed to create libraries.
+    """
+    if settings.FEATURES.get('ENABLE_ORGANIZATION_STAFF_ACCESS_FOR_CONTENT_LIBRARIES', False):
+        return get_organizations_for_non_course_creators(user)
+    elif settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
+        return get_organizations(user)
+    else:
+        return []
+
+
 def user_can_create_organizations(user):
     """
     Returns True if the user can create organizations.
     """
     return user.is_staff or not settings.FEATURES.get('ENABLE_CREATOR_GROUP', False)
 
 
+def get_organizations_for_non_course_creators(user):
+    """
+    Returns the list of organizations which the user is a staff member of, as a list of strings.
+    """
+    orgs_map = set()
+    orgs = OrgStaffRole().get_orgs_for_user(user)
+    # deduplicate
+    for org in orgs:
+        orgs_map.add(org)
+    return list(orgs_map)
+
+
 def get_organizations(user):
     """
     Returns the list of organizations for which the user is allowed to create courses.

diff --git a/cms/djangoapps/contentstore/views/library.py b/cms/djangoapps/contentstore/views/library.py
@@ -35,14 +35,15 @@
 from common.djangoapps.student.roles import (
     CourseInstructorRole,
     CourseStaffRole,
-    LibraryUserRole
+    LibraryUserRole,
+    OrgStaffRole,
+    UserBasedRole,
 )
 from common.djangoapps.util.json_request import JsonResponse, JsonResponseBadRequest, expect_json
 
 from ..config.waffle import REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND
 from ..utils import add_instructor, reverse_library_url
 from .component import CONTAINER_TEMPLATES, get_component_templates
-from .helpers import is_content_creator
 from .block import create_xblock_info
 from .user import user_with_role
 
@@ -79,10 +80,11 @@ def user_can_create_library(user, org=None):
     elif user.is_staff:
         return True
     elif settings.FEATURES.get('ENABLE_CREATOR_GROUP', False):
-        has_course_creator_role = True
-        if org:
-            has_course_creator_role = is_content_creator(user, org)
-        return get_course_creator_status(user) == 'granted' and has_course_creator_role
+        is_course_creator = get_course_creator_status(user) == 'granted'
+        has_org_staff_role = OrgStaffRole().get_orgs_for_user(user).exists()
+        has_course_staff_role = UserBasedRole(user=user, role=CourseStaffRole.ROLE).courses_with_role().exists()
+
+        return is_course_creator or has_org_staff_role or has_course_staff_role
     else:
         # EDUCATOR-1924: DISABLE_LIBRARY_CREATION overrides DISABLE_COURSE_CREATION, if present.
         disable_library_creation = settings.FEATURES.get('DISABLE_LIBRARY_CREATION', None)

diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -423,13 +423,13 @@ def check_index_page(self, separate_archived_courses, org):
 
     @ddt.data(
         # Staff user has course staff access
-        (True, 'staff', None, 0, 20),
-        (False, 'staff', None, 0, 20),
+        (True, 'staff', None, 0, 21),
+        (False, 'staff', None, 0, 21),
         # Base user has global staff access
-        (True, 'user', ORG, 2, 20),
-        (False, 'user', ORG, 2, 20),
-        (True, 'user', None, 2, 20),
-        (False, 'user', None, 2, 20),
+        (True, 'user', ORG, 2, 21),
+        (False, 'user', ORG, 2, 21),
+        (True, 'user', None, 2, 21),
+        (False, 'user', None, 2, 21),
     )
     @ddt.unpack
     def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries):