Skip to content

Sync opencraft-release/sumac.1 with Upstream 20250407-1743984388 #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Agrendalath merged 3 commits into from
Apr 17, 2025
Merged

Sync opencraft-release/sumac.1 with Upstream 20250407-1743984388 #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b709dab
chore: upgrade Django to 4.2.20
magajh Mar 6, 2025
80fa4a8
fix: pasted component search index document missing breadcrumbs [suma…
rpenido Mar 11, 2025
a63a6a6
Merge pull request #36342 from magajh/magajh/patch-django-sumac-4.2.20
feanil Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,11 +496,11 @@ def _import_xml_node_to_parent(

if xblock_class.has_children and temp_xblock.children:
raise NotImplementedError("We don't yet support pasting XBlocks with children")
temp_xblock.parent = parent_key
if copied_from_block:
_fetch_and_set_upstream_link(copied_from_block, copied_from_version_num, temp_xblock, user)
# Save the XBlock into modulestore. We need to save the block and its parent for this to work:
new_xblock = store.update_item(temp_xblock, user.id, allow_not_found=True)
new_xblock.parent = parent_key
parent_xblock.children.append(new_xblock.location)
store.update_item(parent_xblock, user.id)

Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ defusedxml==0.7.1
# ora2
# python3-openid
# social-auth-core
django==4.2.19
django==4.2.20
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ distlib==0.3.9
# via
# -r requirements/edx/testing.txt
# virtualenv
django==4.2.19
django==4.2.20
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ defusedxml==0.7.1
# ora2
# python3-openid
# social-auth-core
django==4.2.19
django==4.2.20
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ dill==0.3.9
# via pylint
distlib==0.3.9
# via virtualenv
django==4.2.19
django==4.2.20
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion scripts/user_retirement/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ click==8.1.6
# edx-django-utils
cryptography==43.0.3
# via pyjwt
django==4.2.19
django==4.2.20
# via
# -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
# -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion scripts/user_retirement/requirements/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cryptography==43.0.3
# pyjwt
ddt==1.7.2
# via -r scripts/user_retirement/requirements/testing.in
django==4.2.19
django==4.2.20
# via
# -r scripts/user_retirement/requirements/base.txt
# django-crum
Expand Down
Loading