Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b5ab6450

Commit b5ab6450 authored 8 years ago by John Eskew

Downloads
- Plain Diff

Merge pull request #11331 from CredoReference/invalid-studio-user-permissions

Invalid StudioPermissionsService object in API to show/save xblock settings in CMS

parents 04b80f04 bab44282

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/tests/test_libraries.py 68 additions, 2 deletions

cms/djangoapps/contentstore/tests/test_libraries.py
cms/djangoapps/contentstore/views/component.py 2 additions, 1 deletion

cms/djangoapps/contentstore/views/component.py
cms/djangoapps/contentstore/views/item.py 50 additions, 0 deletions

cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/preview.py 0 additions, 26 deletions

cms/djangoapps/contentstore/views/preview.py
common/lib/xmodule/xmodule/library_content_module.py 4 additions, 6 deletions

common/lib/xmodule/xmodule/library_content_module.py
common/lib/xmodule/xmodule/x_module.py 3 additions, 2 deletions

common/lib/xmodule/xmodule/x_module.py

with 127 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment