Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into salman/remove-bok-choy

Browse Source
This commit is contained in:
salman2013
2023-10-24 09:06:15 +05:00
parent 2ff9ca8c1b 98fe27fcb7
commit 8d7e451c98
10 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/urls.py
View File

@@ -339,7 +339,7 @@ urlpatterns += [
# Content tagging
urlpatterns += [
path('api/content_tagging/', include(('openedx.core.djangoapps.content_tagging.urls'))),
path('api/content_tagging/', include(('openedx.core.djangoapps.content_tagging.urls', 'content_tagging'))),
]
# studio-content-api specific API docs (using drf-spectacular and openapi-v3)

13
common/djangoapps/student/models/course_enrollment.py
View File

@@ -449,7 +449,7 @@ class CourseEnrollment(models.Model):
if activation_changed or mode_changed:
self.save()
self._update_enrollment_in_request_cache(
self._update_enrollment_state_in_request_cache(
self.user,
self.course_id,
CourseEnrollmentState(self.mode, self.is_active),
@@ -1337,7 +1337,7 @@ class CourseEnrollment(models.Model):
enrollment_state = CourseEnrollmentState(record.mode, record.is_active)
except cls.DoesNotExist:
enrollment_state = CourseEnrollmentState(None, None)
cls._update_enrollment_in_request_cache(user, course_key, enrollment_state)
cls._update_enrollment_state_in_request_cache(user, course_key, enrollment_state)
return enrollment_state
@classmethod
@@ -1354,7 +1354,7 @@ class CourseEnrollment(models.Model):
cache = cls._get_mode_active_request_cache() # lint-amnesty, pylint: disable=redefined-outer-name
for record in records:
enrollment_state = CourseEnrollmentState(record.mode, record.is_active)
cls._update_enrollment(cache, record.user.id, course_key, enrollment_state)
cls._update_enrollment_state_in_cache(cache, record.user.id, course_key, enrollment_state)
@classmethod
def _get_mode_active_request_cache(cls):
@@ -1372,15 +1372,16 @@ class CourseEnrollment(models.Model):
return cls._get_mode_active_request_cache().get((user.id, course_key))
@classmethod
def _update_enrollment_in_request_cache(cls, user, course_key, enrollment_state):
def _update_enrollment_state_in_request_cache(cls, user, course_key, enrollment_state):
"""
Updates the cached value for the user's enrollment in the
request cache.
"""
cls._update_enrollment(cls._get_mode_active_request_cache(), user.id, course_key, enrollment_state)
cls._update_enrollment_state_in_cache(cls._get_mode_active_request_cache(),
user.id, course_key, enrollment_state)
@classmethod
def _update_enrollment(cls, cache, user_id, course_key, enrollment_state): # lint-amnesty, pylint: disable=redefined-outer-name
def _update_enrollment_state_in_cache(cls, cache, user_id, course_key, enrollment_state): # lint-amnesty, pylint: disable=redefined-outer-name
"""
Updates the cached value for the user's enrollment in the
given cache.

4
lms/templates/index_overlay.html
View File

@@ -6,5 +6,5 @@ from openedx.core.djangolib.markup import HTML, Text
%>
<h1>${Text(_(u"Welcome to {platform_name}")).format(platform_name=settings.PLATFORM_NAME)}</h1>
## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See https://open.edx.org for more information.
<p>${Text(_("It works! Powered by Open edX{registered_trademark}")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</p>
## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See https://openedx.org for more information.
<p>${Text(_("It works! Powered by the Open edX{registered_trademark} Platform")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</p>

6
openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py
View File

@@ -7,6 +7,7 @@ from rest_framework.routers import DefaultRouter
from django.urls.conf import path, include
from openedx_tagging.core.tagging.rest_api.v1 import (
views as oel_tagging_views,
views_import as oel_tagging_views_import,
)
@@ -17,6 +18,11 @@ router.register("taxonomies", views.TaxonomyOrgView, basename="taxonomy")
router.register("object_tags", views.ObjectTagOrgView, basename="object_tag")
urlpatterns = [
path(
"taxonomies/<str:pk>/tags/",
oel_tagging_views.TaxonomyTagsView.as_view(),
name="taxonomy-tags",
),
path(
"taxonomies/import/template.<str:file_ext>",
oel_tagging_views_import.TemplateView.as_view(),

4
openedx/core/djangoapps/notifications/base_notification.py
View File

@@ -95,7 +95,7 @@ COURSE_NOTIFICATION_TYPES = {
'replier_name': 'replier name',
},
'email_template': '',
'filter': [FILTER_AUDIT_EXPIRED]
'filters': [FILTER_AUDIT_EXPIRED]
},
'comment_on_followed_post': {
'notification_app': 'discussion',
@@ -111,7 +111,7 @@ COURSE_NOTIFICATION_TYPES = {
'replier_name': 'replier name',
},
'email_template': '',
'filter': [FILTER_AUDIT_EXPIRED]
'filters': [FILTER_AUDIT_EXPIRED]
},
}

2
requirements/constraints.txt
View File

@@ -121,7 +121,7 @@ libsass==0.10.0
click==8.1.6
# pinning this version to avoid updates while the library is being developed
openedx-learning==0.2.5
openedx-learning==0.2.6
# lti-consumer-xblock 9.6.2 contains a breaking change that makes
# existing custom parameter configurations unusable.

2
requirements/edx/base.txt
View File

@@ -785,7 +785,7 @@ openedx-filters==1.6.0
# via
# -r requirements/edx/kernel.in
# lti-consumer-xblock
openedx-learning==0.2.5
openedx-learning==0.2.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in

2
requirements/edx/development.txt
View File

@@ -1315,7 +1315,7 @@ openedx-filters==1.6.0
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# lti-consumer-xblock
openedx-learning==0.2.5
openedx-learning==0.2.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt

2
requirements/edx/doc.txt
View File

@@ -925,7 +925,7 @@ openedx-filters==1.6.0
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
openedx-learning==0.2.5
openedx-learning==0.2.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt

2
requirements/edx/testing.txt
View File

@@ -989,7 +989,7 @@ openedx-filters==1.6.0
# via
# -r requirements/edx/base.txt
# lti-consumer-xblock
openedx-learning==0.2.5
openedx-learning==0.2.6
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt