diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php index 9a64f8c08b3..67f775a80b8 100644 --- a/mod/lesson/continue.php +++ b/mod/lesson/continue.php @@ -210,9 +210,7 @@ if (!$result->correctanswer && !$result->noanswer && !$result->isessayquestion & $url = new moodle_url('/mod/lesson/view.php', array('id'=>$cm->id, 'pageid'=>$result->newpageid)); if ($lesson->review && !$result->correctanswer && !$result->noanswer && !$result->isessayquestion && !$result->maxattemptsreached) { - // When the answer is wrong - the result->newpageid points back to the current question. - $newpageid = $lesson->get_next_page($page->nextpageid); - $url = new moodle_url('/mod/lesson/view.php', array('id'=>$cm->id, 'pageid'=>$newpageid)); + // Button to continue the lesson (the page to go is configured by the teacher). echo $OUTPUT->single_button($url, get_string('reviewquestioncontinue', 'lesson')); } else { // Normal continue button diff --git a/mod/lesson/tests/behat/lesson_question_attempts.feature b/mod/lesson/tests/behat/lesson_question_attempts.feature index 0b10d0fa187..9b6ecd91279 100644 --- a/mod/lesson/tests/behat/lesson_question_attempts.feature +++ b/mod/lesson/tests/behat/lesson_question_attempts.feature @@ -115,49 +115,6 @@ Feature: In a lesson activity, students can not re-attempt a question more than When I press "Submit" Then I should see "Maximum number of attempts reached - Moving to next page" - Scenario: Check that we can move past a question we don't want to re-attempt - Given I log in as "teacher1" - And I am on site homepage - And I follow "Course 1" - And I follow "Test lesson name" - And I navigate to "Edit settings" in current page administration - And I expand all fieldsets - And I set the field "Provide option to try a question again" to "Yes" - And I set the field "Maximum number of attempts" to "3" - And I press "Save and display" - And I log out - And I log in as "student1" - And I am on site homepage - And I follow "Course 1" - And I follow "Test lesson name" - And I should see "First page contents" - And I press "Next page" - And I should see "The earth is round" - And I set the following fields to these values: - | False| 1 | - And I press "Submit" - And I should see "Wrong" - When I press "No, I just want to go on to the next question" - Then I should not see "The earth is round" - And I should see "Kermit is a frog" - And I set the following fields to these values: - | False | 1 | - And I press "Submit" - And I should see "Wrong" - And I press "Yes, I'd like to try again" - And I should see "Kermit is a frog" - And I set the following fields to these values: - | False | 1 | - And I press "Submit" - And I should see "Wrong" - And I press "Yes, I'd like to try again" - And I should see "Kermit is a frog" - And I set the following fields to these values: - | False | 1 | - And I press "Submit" - And I should not see "Yes, I'd like to try again" - And I should see "Continue" - @javascript @_bug_phantomjs Scenario: Check that we can not click back on the browser at the last quiz result page and re-attempt the last question to get full marks Given I log in as "student1"