Skip to content

Make descriptorsystem inherit from Runtime #567

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
jkarni merged 5 commits into from
Aug 12, 2013
Merged

Make descriptorsystem inherit from Runtime #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
562456a
Make descriptorsystem inherit from Runtime
Aug 2, 2013
7bfb080
Switch to studio_view
Aug 2, 2013
b38750e
Refactor wrap_xmodule call
Aug 5, 2013
91b23c4
Merge branch 'master' into jkarni/fix/descriptorsystemruntime
Aug 12, 2013
7fc6057
Merge branch 'master' into jkarni/fix/descriptorsystemruntime
Aug 12, 2013
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
8 changes: 7 additions & 1 deletion cms/djangoapps/contentstore/views/preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,15 @@ def preview_component(request, location):

component = modulestore().get_item(location)

component.get_html = wrap_xmodule(
component.get_html,
component,
'xmodule_edit.html'
)

return render_to_response('component.html', {
'preview': get_preview_html(request, component, 0),
'editor': wrap_xmodule(component.get_html, component, 'xmodule_edit.html')(),
'editor': component.runtime.render(component, None, 'studio_view').content,
})


Expand Down
2 changes: 1 addition & 1 deletion common/lib/xmodule/xmodule/x_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ def studio_view(self, context):
return Fragment(self.get_html())


class DescriptorSystem(object):
class DescriptorSystem(Runtime):
def __init__(self, load_item, resources_fs, error_tracker, **kwargs):
"""
load_item: Takes a Location and returns an XModuleDescriptor
Expand Down