Skip to content
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

Jump to bottom

fix: content search last_published date [FC-0059] #35195

Merged
merged 6 commits into from
Aug 1, 2024
Merged

fix: content search last_published date [FC-0059] #35195

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bcb81a
temp: use openedx-learning WIP branch
pomegranited Jul 29, 2024
2dd0d10
fix: use get_last_publish for components
pomegranited Jul 29, 2024
e38f350
fix: use versioning.last_publish_log for components
pomegranited Jul 30, 2024
0371a67
Merge remote-tracking branch 'origin/master' into jill/fix-content-in…
pomegranited Jul 30, 2024
c0df8cb
chore: bump openedx-learning to 0.10.1
pomegranited Jul 31, 2024
ede93ea
Merge remote-tracking branch 'origin/master' into jill/fix-content-in…
pomegranited Jul 31, 2024
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 openedx/core/djangoapps/content_libraries/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def from_component(cls, library_key, component):
"""
Construct a LibraryXBlockMetadata from a Component object.
"""
last_publish_log = authoring_api.get_last_publish(component.pk)
last_publish_log = component.versioning.last_publish_log

return cls(
usage_key=LibraryUsageLocatorV2(
Expand Down
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/content_tagging/tests/test_objecttag_export_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def test_build_library_object_tree(self) -> None:
"""
Test if we can export a library
"""
with self.assertNumQueries(11):
with self.assertNumQueries(8):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

tagged_library = build_object_tree_with_objecttags(self.library.key, self.all_library_object_tags)

assert tagged_library == self.expected_library_tagged_xblock
Expand Down
3 changes: 2 additions & 1 deletion requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ libsass==0.10.0
click==8.1.6

# pinning this version to avoid updates while the library is being developed
openedx-learning==0.10.0
# FIXME: bump version when merged and tagged https://github.com/openedx/openedx-learning/pull/204
git+https://github.com/openedx/openedx-learning.git@jill/get_last_publish_log_for_entity#egg=openedx_learning
pomegranited marked this conversation as resolved.
Show resolved Hide resolved

# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
openai<=0.28.1
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 @@ -763,7 +763,7 @@ openedx-filters==1.9.0
# -r requirements/edx/kernel.in
# lti-consumer-xblock
# ora2
openedx-learning==0.10.0
openedx-learning @ git+https://github.com/openedx/openedx-learning.git@jill/get_last_publish_log_for_entity
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
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 @@ -1303,7 +1303,7 @@ openedx-filters==1.9.0
# -r requirements/edx/testing.txt
# lti-consumer-xblock
# ora2
openedx-learning==0.10.0
openedx-learning @ git+https://github.com/openedx/openedx-learning.git@jill/get_last_publish_log_for_entity
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.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 @@ -891,7 +891,7 @@ openedx-filters==1.9.0
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-learning==0.10.0
openedx-learning @ git+https://github.com/openedx/openedx-learning.git@jill/get_last_publish_log_for_entity
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.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 @@ -970,7 +970,7 @@ openedx-filters==1.9.0
# -r requirements/edx/base.txt
# lti-consumer-xblock
# ora2
openedx-learning==0.10.0
openedx-learning @ git+https://github.com/openedx/openedx-learning.git@jill/get_last_publish_log_for_entity
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down
Loading