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

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

common/lib/xmodule/xmodule/conditional_module.py

@@ -96,7 +96,7 @@ class ConditionalModule(XModule):
                        'message': self.descriptor.xml_attributes.get('message')}
             html = self.system.render_template('conditional_module.html',
                 context)
-            return json.dumps({'html': [html]})
+            return json.dumps({'html': [html], 'passed': False})
 
         if self.contents is None:
             self.contents = [self.system.get_module(child_descriptor.location
@@ -104,7 +104,7 @@ class ConditionalModule(XModule):
                 for child_descriptor in self.descriptor.get_children()]
 
         html = self.contents
-        return json.dumps({'html': html})
+        return json.dumps({'html': html, 'passed': True})
 
 
 class ConditionalDescriptor(SequenceDescriptor):

lms/templates/conditional_module.html

@@ -12,8 +12,10 @@ def _message(reqm, message):
                         location=reqm.location.url())),
         url_name = reqm.display_name))
 %>
+<div data-passed="false">
 % if message:
 	% for reqm in module.required_modules:
 		<p>${_message(reqm, message)}</p>
 	% endfor
 % endif
+</div>