Merge pull request #85 from open-craft/dragonfi-workbench-workaround

Workaround for workbench not assigning location parameter

mentoring/html.py

@@ -56,7 +56,8 @@ class HTMLBlock(LightChild):
         return block
 
     def student_view(self, context=None):
-        if context.get('as_template', True):
+        as_template = context.get('as_template', True) if context is not None else True
+        if as_template:
             return Fragment(u"<script type='text/template' id='{}'>\n{}\n</script>".format(
                 'light-child-template',
                 self.content

mentoring/light_children.py

@@ -216,7 +216,10 @@ class LightChild(Plugin, LightChildrenMixin):
 
     def __init__(self, parent):
         self.parent = parent
-        self.location = parent.location
+        try:
+            self.location = parent.location
+        except AttributeError:
+            self.location = None
         self.scope_ids = parent.scope_ids
         self.xblock_container = parent.xblock_container
         self._student_data_loaded = False

mentoring/questionnaire.py

@@ -75,7 +75,7 @@ class QuestionnaireAbstractBlock(LightChild, StepMixin):
 
     def student_view(self, context=None):
         name = self.__class__.__name__
-        as_template = context.get('as_template', True)
+        as_template = context.get('as_template', True) if context is not None else True
 
         if str(self.type) not in self.valid_types:
             raise ValueError(u'Invalid value for {}.type: `{}`'.format(name, self.type))