From 6c21469bed1d346bbe5084b1d4bc9832f78cc9ad Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Wed, 30 Jan 2013 11:11:23 -0500 Subject: [PATCH] Fix some image upload issues --- .../lib/xmodule/xmodule/js/src/combinedopenended/display.coffee | 2 ++ common/lib/xmodule/xmodule/open_ended_module.py | 2 +- common/lib/xmodule/xmodule/openendedchild.py | 2 +- common/lib/xmodule/xmodule/self_assessment_module.py | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 85dec528ec..df674436f6 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -187,6 +187,8 @@ class @CombinedOpenEnded if files.size > max_filesize @can_upload_files = false files = "" + else + @can_upload_files = false fd = new FormData() fd.append('student_answer', @answer_area.val()) diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py index a0b9d2428d..b2dba28135 100644 --- a/common/lib/xmodule/xmodule/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_module.py @@ -554,8 +554,8 @@ class OpenEndedModule(openendedchild.OpenEndedChild): # add new history element with answer and empty score and hint. get = self.append_image_to_student_answer(get) - self.new_history_entry(get['student_answer']) get['student_answer'] = OpenEndedModule.sanitize_html(get['student_answer']) + self.new_history_entry(get['student_answer']) self.send_to_grader(get['student_answer'], system) self.change_state(self.ASSESSING) diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py index 3e6cc22d53..df5113bbaa 100644 --- a/common/lib/xmodule/xmodule/openendedchild.py +++ b/common/lib/xmodule/xmodule/openendedchild.py @@ -285,8 +285,8 @@ class OpenEndedChild(object): """ success = False s3_public_url = "" - image_data.seek(0) try: + image_data.seek(0) image = Image.open(image_data) image_ok = open_ended_image_submission.run_image_tests(image) log.debug("Image ok: {0}".format(image_ok)) diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py index 467cdebd7a..221631e8af 100644 --- a/common/lib/xmodule/xmodule/self_assessment_module.py +++ b/common/lib/xmodule/xmodule/self_assessment_module.py @@ -204,6 +204,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild): # add new history element with answer and empty score and hint. get = self.append_image_to_student_answer(get) + get['student_answer'] = SelfAssessmentModule.sanitize_html(get['student_answer']) self.new_history_entry(get['student_answer']) self.change_state(self.ASSESSING)