Commit 50f951d9 by Vik Paruchuri

Bug fixes

parent 6427a7da
...@@ -262,16 +262,16 @@ def _get_next(course_id, grader_id, location): ...@@ -262,16 +262,16 @@ def _get_next(course_id, grader_id, location):
try: try:
response = staff_grading_service().get_next(course_id, location, grader_id) response = staff_grading_service().get_next(course_id, location, grader_id)
response_json = json.loads(response) response_json = json.loads(response)
rubric = response_json['rubric'] if response_json.has_key('rubric'):
rubric_renderer = CombinedOpenEndedRubric(False) rubric = response_json['rubric']
success, rubric_html = rubric_renderer.render_rubric(rubric) rubric_renderer = CombinedOpenEndedRubric(False)
if not success: success, rubric_html = rubric_renderer.render_rubric(rubric)
error_message = "Could not render rubric: {0}".format(rubric) if not success:
log.exception(error_message) error_message = "Could not render rubric: {0}".format(rubric)
return json.dumps({'success': False, log.exception(error_message)
'error': error_message}) return json.dumps({'success': False,
response_json['rubric'] = rubric_html 'error': error_message})
log.debug(rubric_html) response_json['rubric'] = rubric_html
return json.dumps(response_json) return json.dumps(response_json)
except GradingServiceError: except GradingServiceError:
log.exception("Error from grading service. server url: {0}" log.exception("Error from grading service. server url: {0}"
......
...@@ -57,12 +57,6 @@ ...@@ -57,12 +57,6 @@
</section> </section>
<section class="rubric-container">
<div class="rubric-wrapper">
</div>
</section>
<div class="action-button"> <div class="action-button">
<input type=button value="Submit" class="action-button" name="show" /> <input type=button value="Submit" class="action-button" name="show" />
</div> </div>
......
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