Skip to content

[BD-13][BB-6926] refactor: fix module-containing imports #320

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 1 commit into from
Jan 30, 2023
Merged

[BD-13][BB-6926] refactor: fix module-containing imports #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ Please See the [releases tab](https://github.com/openedx/xblock-lti-consumer/rel
Unreleased
~~~~~~~~~~

7.3.0 - 2023-01-30
------------------
* Rename edx-platform import of ``get_module_for_descriptor_internal``.

7.2.3 - 2023-01-24
------------------
* This release fixes a bug in the way that the PII sharing consent dialog renders. The bug resulted in the "OK" and
Expand Down
2 changes: 1 addition & 1 deletion lti_consumer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
from .apps import LTIConsumerApp
from .lti_xblock import LtiConsumerXBlock

__version__ = '7.2.3'
__version__ = '7.3.0'
1 change: 0 additions & 1 deletion lti_consumer/lti_xblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,6 @@ def descriptor(self):

This is for backwards compatibility with the XModule API.
Some LMS code still assumes a descriptor attribute on the XBlock object.
See courseware.module_render.rebind_noauth_module_to_user.
"""
return self

Expand Down
8 changes: 4 additions & 4 deletions lti_consumer/plugin/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def load_block_as_user(location): # pragma: nocover
"""
# pylint: disable=import-error,import-outside-toplevel
from crum import get_current_user, get_current_request
from lms.djangoapps.courseware.module_render import get_module_for_descriptor_internal
from lms.djangoapps.courseware.block_render import get_block_for_descriptor_internal
from openedx.core.lib.xblock_utils import request_token

# Retrieve descriptor from modulestore
Expand All @@ -114,7 +114,7 @@ def load_block_as_user(location): # pragma: nocover
return descriptor

# If not load this block to bind it onto the user
get_module_for_descriptor_internal(
get_block_for_descriptor_internal(
user=user,
descriptor=descriptor,
student_data=None,
Expand All @@ -138,14 +138,14 @@ def _load_block_as_anonymous_user(location, descriptor): # pragma: nocover
# pylint: disable=import-error,import-outside-toplevel
from crum import impersonate
from django.contrib.auth.models import AnonymousUser
from lms.djangoapps.courseware.module_render import get_module_for_descriptor_internal
from lms.djangoapps.courseware.block_render import get_block_for_descriptor_internal

# ensure `crum.get_current_user` returns AnonymousUser. It returns None when outside
# of request scope which causes error during block loading.
user = AnonymousUser()
with impersonate(user):
# Load block, attaching it to AnonymousUser
get_module_for_descriptor_internal(
get_block_for_descriptor_internal(
user=user,
descriptor=descriptor,
student_data=None,
Expand Down