Commit 7467e278 by Braden MacDonald Committed by GitHub

Merge pull request #117 from open-craft/fix-mako-context-modification

Fix mako template context error
parents fe0e8254 ee9d1530
...@@ -9,7 +9,7 @@ install: ...@@ -9,7 +9,7 @@ install:
- "pip install -r requirements.txt" - "pip install -r requirements.txt"
- "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/base.txt" - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/base.txt"
- "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/test.txt" - "pip install -r $VIRTUAL_ENV/src/xblock-sdk/requirements/test.txt"
- "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.0.3.tar.gz" - "pip uninstall -y xblock-problem-builder && python setup.py sdist && pip install dist/xblock-problem-builder-2.0.4.tar.gz"
- "pip install -r test_requirements.txt" - "pip install -r test_requirements.txt"
- "mkdir var" - "mkdir var"
script: script:
......
...@@ -164,7 +164,7 @@ class AnswerBlock(AnswerMixin, StepMixin, StudioEditableXBlockMixin, XBlock): ...@@ -164,7 +164,7 @@ class AnswerBlock(AnswerMixin, StepMixin, StudioEditableXBlockMixin, XBlock):
def mentoring_view(self, context=None): def mentoring_view(self, context=None):
""" Render this XBlock within a mentoring block. """ """ Render this XBlock within a mentoring block. """
context = context or {} context = context.copy() if context else {}
context['self'] = self context['self'] = self
context['hide_header'] = context.get('hide_header', False) or not self.show_title context['hide_header'] = context.get('hide_header', False) or not self.show_title
html = loader.render_template('templates/html/answer_editable.html', context) html = loader.render_template('templates/html/answer_editable.html', context)
...@@ -266,7 +266,7 @@ class AnswerRecapBlock(AnswerMixin, StudioEditableXBlockMixin, XBlock): ...@@ -266,7 +266,7 @@ class AnswerRecapBlock(AnswerMixin, StudioEditableXBlockMixin, XBlock):
def mentoring_view(self, context=None): def mentoring_view(self, context=None):
""" Render this XBlock within a mentoring block. """ """ Render this XBlock within a mentoring block. """
context = context or {} context = context.copy() if context else {}
context['title'] = self.display_name context['title'] = self.display_name
context['description'] = self.description context['description'] = self.description
context['student_input'] = self.student_input context['student_input'] = self.student_input
......
...@@ -95,12 +95,12 @@ class StepMixin(object): ...@@ -95,12 +95,12 @@ class StepMixin(object):
return self._(u"Question") return self._(u"Question")
def author_view(self, context): def author_view(self, context):
context = context or {} context = context.copy() if context else {}
context['hide_header'] = True context['hide_header'] = True
return self.mentoring_view(context) return self.mentoring_view(context)
def author_preview_view(self, context): def author_preview_view(self, context):
context = context or {} context = context.copy() if context else {}
context['hide_header'] = True context['hide_header'] = True
return self.student_view(context) return self.student_view(context)
......
...@@ -70,7 +70,7 @@ class MentoringTableBlock(StudioEditableXBlockMixin, StudioContainerXBlockMixin, ...@@ -70,7 +70,7 @@ class MentoringTableBlock(StudioEditableXBlockMixin, StudioContainerXBlockMixin,
has_children = True has_children = True
def student_view(self, context): def student_view(self, context):
context = context or {} context = context.copy() if context else {}
fragment = Fragment() fragment = Fragment()
header_values = [] header_values = []
content_values = [] content_values = []
...@@ -136,7 +136,7 @@ class MentoringTableColumn(StudioEditableXBlockMixin, StudioContainerXBlockMixin ...@@ -136,7 +136,7 @@ class MentoringTableColumn(StudioEditableXBlockMixin, StudioContainerXBlockMixin
def mentoring_view(self, context=None): def mentoring_view(self, context=None):
""" Render this XBlock within a mentoring block. """ """ Render this XBlock within a mentoring block. """
context = context or {} context = context.copy() if context else {}
fragment = Fragment() fragment = Fragment()
for child_id in self.children: for child_id in self.children:
child = self.runtime.get_block(child_id) child = self.runtime.get_block(child_id)
......
...@@ -75,7 +75,7 @@ BLOCKS = [ ...@@ -75,7 +75,7 @@ BLOCKS = [
setup( setup(
name='xblock-problem-builder', name='xblock-problem-builder',
version='2.0.3', version='2.0.4',
description='XBlock - Problem Builder', description='XBlock - Problem Builder',
packages=['problem_builder', 'problem_builder.v1'], packages=['problem_builder', 'problem_builder.v1'],
install_requires=[ install_requires=[
......
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