Merge branch 'MDL-72309' of git://github.com/paulholden/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2021-10-07 22:42:16 +02:00
commit 553af0dddf
7 changed files with 8 additions and 0 deletions

View File

@ -84,6 +84,7 @@ class tool_uploadcourse_step2_form extends tool_uploadcourse_base_form {
$displaylist = core_course_category::make_categories_list('moodle/course:create');
$mform->addElement('autocomplete', 'defaults[category]', get_string('coursecategory'), $displaylist);
$mform->addRule('defaults[category]', null, 'required', null, 'client');
$mform->addHelpButton('defaults[category]', 'coursecategory');
$choices = array();

View File

@ -107,6 +107,7 @@ class copy_form extends \moodleform {
$displaylist[$course->category] = \core_course_category::get($course->category, MUST_EXIST, true)->get_formatted_name();
}
$mform->addElement('autocomplete', 'category', get_string('coursecategory'), $displaylist);
$mform->addRule('category', null, 'required', null, 'client');
$mform->addHelpButton('category', 'coursecategory');
// Course visibility.

View File

@ -44,6 +44,7 @@ class cohort_edit_form extends moodleform {
$options = $this->get_category_options($cohort->contextid);
$mform->addElement('autocomplete', 'contextid', get_string('context', 'role'), $options);
$mform->addRule('contextid', null, 'required', null, 'client');
$mform->addElement('text', 'idnumber', get_string('idnumber', 'cohort'), 'maxlength="254" size="50"');
$mform->setType('idnumber', PARAM_RAW); // Idnumbers are plain text, must not be changed.

View File

@ -112,6 +112,7 @@ class core_course_deletecategory_form extends moodleform {
if ($displaylist) {
$mform->addElement('autocomplete', 'newparent', get_string('movecategorycontentto'), $displaylist);
$mform->addRule('newparent', null, 'required', null, 'client');
if (in_array($this->coursecat->parent, $displaylist)) {
$mform->setDefault('newparent', $this->coursecat->parent);
}

View File

@ -64,6 +64,7 @@ class core_course_editcategory_form extends moodleform {
}
$mform->addElement('autocomplete', 'parent', get_string('parentcategory'), $options);
$mform->addRule('parent', null, 'required', null, 'client');
$mform->addElement('text', 'name', get_string('categoryname'), array('size' => '30'));
$mform->addRule('name', get_string('required'), 'required', null);

View File

@ -78,6 +78,7 @@ class course_edit_form extends moodleform {
if (has_capability('moodle/course:create', $categorycontext)) {
$displaylist = core_course_category::make_categories_list('moodle/course:create');
$mform->addElement('autocomplete', 'category', get_string('coursecategory'), $displaylist);
$mform->addRule('category', null, 'required', null, 'client');
$mform->addHelpButton('category', 'coursecategory');
$mform->setDefault('category', $category->id);
} else {
@ -94,6 +95,7 @@ class course_edit_form extends moodleform {
->get_formatted_name();
}
$mform->addElement('autocomplete', 'category', get_string('coursecategory'), $displaylist);
$mform->addRule('category', null, 'required', null, 'client');
$mform->addHelpButton('category', 'coursecategory');
} else {
//keep current

View File

@ -71,6 +71,7 @@ class course_request_form extends moodleform {
if (empty($CFG->lockrequestcategory)) {
$displaylist = core_course_category::make_categories_list('moodle/course:request');
$mform->addElement('autocomplete', 'category', get_string('coursecategory'), $displaylist);
$mform->addRule('category', null, 'required', null, 'client');
$mform->setDefault('category', $CFG->defaultrequestcategory);
$mform->addHelpButton('category', 'coursecategory');
}