mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-81365-main' of https://github.com/ilyatregubov/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-03-28 14:31:16 +07:00
commit 61c8cdaf11
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
enrol/cohort/lib.php
View File

@ -620,19 +620,15 @@ class enrol_cohort_plugin extends enrol_plugin {
* @return lang_string|null Error
*/
public function validate_plugin_data_context(array $enrolmentdata, ?int $courseid = null): ?lang_string {
$error = null;
if (isset($enrolmentdata['customint1'])) {
$cohortid = $enrolmentdata['customint1'];
$coursecontext = \context_course::instance($courseid);
if (!cohort_get_cohort($cohortid, $coursecontext)) {
return new lang_string('contextcohortnotallowed', 'cohort', $enrolmentdata['cohortidnumber']);
$error = new lang_string('contextcohortnotallowed', 'cohort', $enrolmentdata['cohortidnumber']);
}
}
$enrolmentdata += [
'customint1' => null,
'customint2' => null,
'roleid' => 0,
];
return parent::validate_plugin_data_context($enrolmentdata, $courseid);
return $error;
}
/**

22
lib/enrollib.php
View File

@ -3548,33 +3548,13 @@ abstract class enrol_plugin {
* This is called from the tool_uploadcourse if the plugin supports instance creation in
* upload course ({@see self::is_csv_upload_supported()})
*
* The fallback is to call the edit_instance_validation() but it will be better if the plugins
* implement this method to return better error messages.
* Override it if plugin can validate provided data in relevant context.
*
* @param array $enrolmentdata enrolment data to validate.
* @param int|null $courseid Course ID.
* @return lang_string|null Error
*/
public function validate_plugin_data_context(array $enrolmentdata, ?int $courseid = null): ?lang_string {
global $DB;
if ($courseid) {
$enrolmentdata += ['courseid' => $courseid, 'id' => 0, 'status' => ENROL_INSTANCE_ENABLED];
$instance = (object)[
'id' => null,
'courseid' => $courseid,
'status' => $enrolmentdata['status'],
'type' => $this->get_name(),
];
if (array_key_exists('role', $enrolmentdata)) {
$instance->roleid = $DB->get_field('role', 'id', ['shortname' => $enrolmentdata['role']]);
}
$formerrors = $this->edit_instance_validation($enrolmentdata, [], $instance, context_course::instance($courseid));
if (!empty($formerrors)) {
$errors = array_map(fn($key) => "{$key}: {$formerrors[$key]}", array_keys($formerrors));
return new lang_string('errorcannotcreateorupdateenrolment', 'tool_uploadcourse', $errors);
}
}
return null;
}