From d264cbbb8a15f40ad1c4616046852ee2e00754ab Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Tue, 6 Oct 2015 21:39:54 -0500 Subject: [PATCH] MDL-51250 course: Add validation for section name --- course/editsection_form.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/course/editsection_form.php b/course/editsection_form.php index 25055235b89..3c8e4885921 100644 --- a/course/editsection_form.php +++ b/course/editsection_form.php @@ -38,6 +38,10 @@ class editsection_form extends moodleform { $mform->addGroup($elementgroup, 'name_group', get_string('sectionname'), ' ', false); $mform->addGroupRule('name_group', array('name' => array(array(get_string('maximumchars', '', 255), 'maxlength', 255)))); + // Add rule for name_group to make sure that the section name is not blank if 'Use default section name' + // checkbox is unchecked. + $mform->addRule('name_group', get_string('required'), 'required', null, 'client'); + $mform->setDefault('usedefaultname', true); $mform->setType('name', PARAM_TEXT); $mform->disabledIf('name','usedefaultname','checked'); @@ -112,8 +116,7 @@ class editsection_form extends moodleform { $data = parent::get_data(); if ($data !== null) { $editoroptions = $this->_customdata['editoroptions']; - $trimmedname = $data->name; - if (!empty($data->usedefaultname) || empty($trimmedname)) { + if (!empty($data->usedefaultname)) { $data->name = null; } $data = file_postupdate_standard_editor($data, 'summary', $editoroptions, @@ -138,6 +141,15 @@ class editsection_form extends moodleform { \core_availability\frontend::report_validation_errors($data, $errors); } + // Validate section name if 'Use default section name' is unchecked. + if (empty($data['usedefaultname'])) { + // Make sure the trimmed value of section name is not empty. + $trimmedname = trim($data['name']); + if (empty($trimmedname)) { + $errors['name_group'] = get_string('required'); + } + } + return $errors; } } -- 2.43.0