Commit d9ad4b57 by Valera Rozuvan

Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged

parents 268e5b4b 82a74abd
......@@ -115,7 +115,13 @@ class ConditionalModule(XModule):
self.contents = [self.system.get_module(child_descriptor).get_html()
for child_descriptor in self.descriptor.get_children()]
# TODO make this work
self.icon_class = self.system.get_module(
self.descriptor.get_children()[0]).get_icon_class()
html = self.contents
return json.dumps({'html': html, 'passed': True})
......
......@@ -85,6 +85,7 @@ class PollModule(XModule):
self.poll_answers = temp_poll_answers
self.poll_answer = ''
return json.dumps('success')
else: # return error message
return json.dumps({'error': 'Unknown Command!'})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment