From 2c8b8af4bd8064147e14ad3df357564f27b7096f Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Wed, 3 Apr 2019 11:47:52 +0200
Subject: [PATCH] MDL-10965 tool_generator: use existing course element

---
 .../generator/classes/make_testplan_form.php  |  3 +--
 .../generator/classes/testplan_backend.php    | 19 -------------------
 admin/tool/generator/upgrade.txt              |  6 ++++++
 3 files changed, 7 insertions(+), 21 deletions(-)
 create mode 100644 admin/tool/generator/upgrade.txt

diff --git a/admin/tool/generator/classes/make_testplan_form.php b/admin/tool/generator/classes/make_testplan_form.php
index 15552d5775a..ee40e706e99 100644
--- a/admin/tool/generator/classes/make_testplan_form.php
+++ b/admin/tool/generator/classes/make_testplan_form.php
@@ -47,8 +47,7 @@ class tool_generator_make_testplan_form extends moodleform {
             tool_generator_testplan_backend::get_size_choices());
         $mform->setDefault('size', tool_generator_testplan_backend::DEFAULT_SIZE);
 
-        $mform->addElement('select', 'courseid', get_string('targetcourse', 'tool_generator'),
-            tool_generator_testplan_backend::get_course_options());
+        $mform->addElement('course', 'courseid', get_string('targetcourse', 'tool_generator'));
 
         $mform->addElement('advcheckbox', 'updateuserspassword', get_string('updateuserspassword', 'tool_generator'));
         $mform->addHelpButton('updateuserspassword', 'updateuserspassword', 'tool_generator');
diff --git a/admin/tool/generator/classes/testplan_backend.php b/admin/tool/generator/classes/testplan_backend.php
index 2e43b4c6b17..6b3c2e447dd 100644
--- a/admin/tool/generator/classes/testplan_backend.php
+++ b/admin/tool/generator/classes/testplan_backend.php
@@ -71,25 +71,6 @@ class tool_generator_testplan_backend extends tool_generator_backend {
         return $options;
     }
 
-    /**
-     * Gets the list of courses that can be used used to generate a test.
-     *
-     * @return array The list of options as courseid => name
-     */
-    public static function get_course_options() {
-        $courses = get_courses('all', 'c.sortorder ASC', 'c.id, c.shortname, c.fullname');
-        if (!$courses) {
-            print_error('error_nocourses', 'tool_generator');
-        }
-
-        $options = array();
-        unset($courses[1]);
-        foreach ($courses as $course) {
-            $options[$course->id] = $course->fullname . '(' . $course->shortname . ')';
-        }
-        return $options;
-    }
-
     /**
      * Getter for moodle-performance-comparison project URL.
      *
diff --git a/admin/tool/generator/upgrade.txt b/admin/tool/generator/upgrade.txt
new file mode 100644
index 00000000000..4d5b19fb4b3
--- /dev/null
+++ b/admin/tool/generator/upgrade.txt
@@ -0,0 +1,6 @@
+This files describes API changes in core libraries and APIs,
+information provided here is intended especially for developers.
+
+=== 3.7 ===
+
+* Function tool_generator_testplan_backend::get_course_options() is removed, the 'course' form element is used instead.