mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Merge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle
This commit is contained in:
commit
69cfd26e15
@ -331,15 +331,19 @@ class mod_scorm_mod_form extends moodleform_mod {
|
||||
}
|
||||
|
||||
// Set some completion default data.
|
||||
if (!empty($defaultvalues['completionstatusrequired']) && !is_array($defaultvalues['completionstatusrequired'])) {
|
||||
$cvalues = array();
|
||||
if (empty($this->_instance)) {
|
||||
// When in add mode, set a default completion rule that requires the SCORM's status be set to "Completed".
|
||||
$cvalues[4] = 1;
|
||||
} else if (!empty($defaultvalues['completionstatusrequired']) && !is_array($defaultvalues['completionstatusrequired'])) {
|
||||
// Unpack values.
|
||||
$cvalues = array();
|
||||
foreach (scorm_status_options() as $key => $value) {
|
||||
if (($defaultvalues['completionstatusrequired'] & $key) == $key) {
|
||||
$cvalues[$key] = 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (!empty($cvalues)) {
|
||||
$defaultvalues['completionstatusrequired'] = $cvalues;
|
||||
}
|
||||
|
||||
@ -481,7 +485,6 @@ class mod_scorm_mod_form extends moodleform_mod {
|
||||
}
|
||||
}
|
||||
|
||||
$this->data_preprocessing($defaultvalues);
|
||||
parent::set_data($defaultvalues);
|
||||
}
|
||||
|
||||
@ -513,10 +516,6 @@ class mod_scorm_mod_form extends moodleform_mod {
|
||||
$firstkey = $key;
|
||||
}
|
||||
$mform->addElement('checkbox', $key, $name, $value);
|
||||
// Default completion rule that requires the SCORM's status be set to "Completed".
|
||||
if ($key === 'completionstatusrequired[4]') {
|
||||
$mform->setDefault($key, 1);
|
||||
}
|
||||
$mform->setType($key, PARAM_BOOL);
|
||||
$items[] = $key;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user