From 8bfad8f2bd0c7ee83b0ac1631275a51a6df57c98 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Fri, 8 Feb 2013 23:11:51 -0500 Subject: [PATCH] Work on properly displaying rubric icons --- common/lib/xmodule/xmodule/combined_open_ended_modulev1.py | 3 ++- .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py index ef8e8ce4e4..59b9fa5ebb 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py @@ -532,11 +532,12 @@ class CombinedOpenEndedV1Module(): Input: AJAX get dictionary Output: Dictionary to be rendered via ajax that contains the result html. """ - self.update_task_states() all_responses = [] loop_up_to_task = self.current_task_number+1 if self.state in [self.ASSESSING, self.INITIAL] and self.current_task_number>0: loop_up_to_task = loop_up_to_task-1 + log.debug(self.allow_reset) + log.debug(self.check_allow_reset()) log.debug(self.state) log.debug(self.current_task_number) log.debug(loop_up_to_task) diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index a710ecbd0c..377d08cd13 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -96,6 +96,9 @@ class @CombinedOpenEnded @rebind() + if @task_number>1 + @show_combined_rubric_current() + # locally scoped jquery. $: (selector) -> $(selector, @el) @@ -180,8 +183,6 @@ class @CombinedOpenEnded @hide_file_upload() @hint_area.attr('disabled', false) @show_status_current() - if @task_number>1 - @show_combined_rubric_current() if @task_number==1 and @child_state=='assessing' @prompt_hide() if @child_state == 'done'