Fixed submit button being enabled after page reload

problem_builder/public/js/mentoring_standard_view.js

@@ -4,7 +4,7 @@ function MentoringStandardView(runtime, element, mentoring) {
 
     var callIfExists = mentoring.callIfExists;
 
-    function handleSubmitResults(response) {
+    function handleSubmitResults(response, disable_submit) {
         messagesDOM.empty().hide();
 
         $.each(response.results || [], function(index, result_spec) {
@@ -28,9 +28,16 @@ function MentoringStandardView(runtime, element, mentoring) {
             messagesDOM.prepend('<div class="title1">' + mentoring.data.feedback_label + '</div>');
             messagesDOM.show();
         }
+
+        // this method is called on successful submission and on page load
+        // results will be empty only for initial load if no submissions was made
+        // in such case we must allow submission to support submitting empty read-only long answer recaps
+        if (disable_submit || response.results.length > 0) {
+            submitDOM.attr('disabled', 'disabled');
+        }
     }
 
-    function handleSubmitError(jqXHR, textStatus, errorThrown) {
+    function handleSubmitError(jqXHR, textStatus, errorThrown, disable_submit) {
         if (textStatus == "error") {
             var errMsg = errorThrown;
             // Check if there's a more specific JSON error message:
@@ -44,6 +51,10 @@ function MentoringStandardView(runtime, element, mentoring) {
             mentoring.setContent(messagesDOM, errMsg);
             messagesDOM.show();
         }
+
+        if (disable_submit) {
+            submitDOM.attr('disabled', 'disabled');
+        }
     }
 
     function calculate_results(handler_name, disable_submit) {
@@ -59,12 +70,9 @@ function MentoringStandardView(runtime, element, mentoring) {
         if (submitXHR) {
             submitXHR.abort();
         }
-        submitXHR = $.post(handlerUrl, JSON.stringify(data)).success(handleSubmitResults).error(handleSubmitError);
-
-        if (disable_submit) {
-            var disable_submit_callback = function(){ submitDOM.attr('disabled', 'disabled'); };
-            submitXHR.success(disable_submit_callback).error(disable_submit_callback);
-        }
+        submitXHR = $.post(handlerUrl, JSON.stringify(data))
+            .success(function(response) { handleSubmitResults(response, disable_submit); })
+            .error(function(jqXHR, textStatus, errorThrown) { handleSubmitError(jqXHR, textStatus, errorThrown, disable_submit); });
     }
 
     function get_results(){

problem_builder/tests/integration/test_mentoring.py

@@ -170,6 +170,7 @@ class ProblemBuilderQuestionnaireBlockTest(ProblemBuilderBaseTest):
         mentoring = self.load_scenario("feedback_persistence.xml")
         answer, mcq, mrq, rating = self._get_controls(mentoring)
         messages = self._get_messages_element(mentoring)
+        submit = mentoring.find_element_by_css_selector('.submit input.input-main')
 
         answer_checkmark = answer.find_element_by_xpath("parent::*").find_element_by_css_selector(".answer-checkmark")
 
@@ -181,6 +182,7 @@ class ProblemBuilderQuestionnaireBlockTest(ProblemBuilderBaseTest):
         for i in range(5):
             self._assert_feedback_hidden(rating, i)
         self.assertFalse(messages.is_displayed())
+        self.assertFalse(submit.is_enabled())
 
     def test_persists_feedback_on_page_reload(self):
         mentoring = self.load_scenario("feedback_persistence.xml")
@@ -195,7 +197,15 @@ class ProblemBuilderQuestionnaireBlockTest(ProblemBuilderBaseTest):
         mentoring = self.go_to_view("student_view")
         answer, mcq, mrq, rating = self._get_controls(mentoring)
         messages = self._get_messages_element(mentoring)
+        submit = mentoring.find_element_by_css_selector('.submit input.input-main')
+
         self._standard_checks(answer, mcq, mrq, rating, messages, only_selected=True)
+        # after reloading submit is disabled...
+        self.assertFalse(submit.is_enabled())
+
+        # ...until some changes are done
+        self.click_choice(mrq, "Its elegance")
+        self.assertTrue(submit.is_enabled())
 
     def test_given_perfect_score_in_past_loads_current_result(self):
         mentoring = self.load_scenario("feedback_persistence.xml")