mod-lesson MDL-25632 Set a default jump to display when a question has no answers...

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 35b8982..4ca3623 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -2470,6 +2470,8 @@ abstract class lesson_page extends lesson_base {
             foreach ($answers as $answer) {
                 $jumps[] = $this->get_jump_name($answer->jumpto);
             }
+        } else {
+            $jumps[] = $this->get_jump_name($this->properties->nextpageid);
         }
         return $jumps;
     }

diff --git a/mod/lesson/pagetypes/branchtable.php b/mod/lesson/pagetypes/branchtable.php
index 7961bce..5b6cabd 100644 (file)
--- a/mod/lesson/pagetypes/branchtable.php
+++ b/mod/lesson/pagetypes/branchtable.php
@@ -64,6 +64,10 @@ class lesson_page_type_branchtable extends lesson_page {
                 }
                 $jumps[] = $this->get_jump_name($answer->jumpto);
             }
+        } else {
+            // We get here is the lesson was created on a Moodle 1.9 site and
+            // the lesson contains question pages without any answers.
+            $jumps[] = $this->get_jump_name($this->properties->nextpageid);
         }
         return $jumps;
     }

diff --git a/mod/lesson/pagetypes/matching.php b/mod/lesson/pagetypes/matching.php
index 9903a6d..1d491b8 100644 (file)
--- a/mod/lesson/pagetypes/matching.php
+++ b/mod/lesson/pagetypes/matching.php
@@ -420,6 +420,8 @@ class lesson_page_type_matching extends lesson_page {
             foreach ($answers as $answer) {
                 $jumps[] = $this->get_jump_name($answer->jumpto);
             }
+        } else {
+            $jumps[] = $this->get_jump_name($this->properties->nextpageid);
         }
         return $jumps;
     }

diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index 9829ad0..a9d912f 100644 (file)
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -57,7 +57,6 @@ class lesson_page_type_multichoice extends lesson_page {
     public function get_jumps() {
         global $DB;
         $jumps = array();
-        $params = array ("lessonid" => $this->lesson->id, "pageid" => $this->properties->id);
         if ($answers = $this->get_answers()) {
             foreach ($answers as $answer) {
                 if ($answer->answer === '') {
@@ -66,6 +65,10 @@ class lesson_page_type_multichoice extends lesson_page {
                 }
                 $jumps[] = $this->get_jump_name($answer->jumpto);
             }
+        } else {
+            // We get here is the lesson was created on a Moodle 1.9 site and
+            // the lesson contains question pages without any answers.
+            $jumps[] = $this->get_jump_name($this->properties->nextpageid);
         }
         return $jumps;
     }