Fixes for #6013: Implement user service to return currently-logged-in user #6563
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nedbat
force-pushed
the
ned/fix-6013
branch
2 times, most recently
from
c34270e
to
f2fdffd
Compare
|
@cpennington any concerns? |
|
@jbau pinging you so you get notifications of any discussion that happens. |
nedbat
changed the title
| @@ -74,6 +89,8 @@ def create_modulestore_instance(engine, content_store, doc_store_config, options | |||
| if issubclass(class_, BranchSettingMixin): | |||
| _options['branch_setting_func'] = _get_modulestore_branch_setting | |||
|
|
|||
| xb_user_service = DjangoXBlockUserService(get_current_user()) if HAS_USER_SERVICE and not user_service else None | |||
There was a problem hiding this comment.
Nit: I probably would have written this on two lines, but that's more a personal preference than a strong recommendation.
|
👍 |
|
thanks ned. curious about the formerly failing bok-choy test. did you have to do anything to fix it? |
|
@jbau it wasn't failing by the time I got to it, but flaky tests did slow this down. I mostly had to adjust the pylint violations. |
nedbat
force-pushed
the
ned/fix-6013
branch
3 times, most recently
from
de7ba16
to
f069d1a
Compare
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position actually do what it intends to do, but fixing the URL the test client visits
returns XBlockuser with 2 data layers
nedbat
added a commit
that referenced
this pull request
Jan 16, 2015
Fixes for #6013: Implement user service to return currently-logged-in user
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.