Skip to content

Fix capa optioninput template to honor inline flag #845

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
chrisndodge merged 2 commits into from
Sep 5, 2013
Merged

Fix capa optioninput template to honor inline flag #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7fdcd9
fix capa optioninput template to honor inline flag
ichuang Aug 31, 2013
69f7298
consistently use inline=False as default in capa inputtypes
ichuang Sep 5, 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
2 changes: 1 addition & 1 deletion common/lib/capa/capa/inputtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def get_attributes(cls):
Convert options to a convenient format.
"""
return [Attribute('options', transform=cls.parse_options),
Attribute('inline', '')]
Attribute('inline', False)]

registry.register(OptionInput)

Expand Down
4 changes: 3 additions & 1 deletion common/lib/capa/capa/templates/optioninput.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<form class="inputtype option-input">
<% doinline = "inline" if inline else "" %>

<form class="inputtype option-input ${doinline}">
<select name="input_${id}" id="input_${id}" aria-describedby="answer_${id}">
<option value="option_${id}_dummy_default"> </option>
% for option_id, option_description in options:
Expand Down
2 changes: 1 addition & 1 deletion common/lib/capa/capa/tests/test_inputtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_rendering(self):
'options': [('Up', 'Up'), ('Down', 'Down')],
'status': 'answered',
'msg': '',
'inline': '',
'inline': False,
'id': 'sky_input'}

self.assertEqual(context, expected)
Expand Down