Merge release from 2014-03-10 - #2885
Merged
cpennington merged 6 commits intoMar 10, 2014
Merged
Conversation
…e FieldData Without this, the new 'items' field in the course_info xmodule caused bizarre behavior. If you added the text 'items' to a course_info section, then the LMS would throw a 500, because the field name isn't 'data', but the stored data is a string, leading to the check of `key.field_name in self._data`, where key.field_name is the string 'items', and self._data is the content string.
Cale/fix crazy items error
Conflicts: cms/envs/common.py lms/envs/common.py
Contributor
Author
Contributor
|
👍 |
cpennington
added a commit
that referenced
this pull request
Mar 10, 2014
Merge release from 2014-03-10
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.