moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-33393' of git://github.com/timhunt/moodle

Browse source 
Conflicts:
	mod/quiz/lang/en/quiz.php
This commit is contained in:
Dan Poltawski 2012-06-12 17:00:09 +08:00
commit 203d255116
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/quiz/mod_form.php
View file

@ -94,6 +94,7 @@ class mod_quiz_mod_form extends moodleform_mod {
// What to do with overdue attempts.
$mform->addElement('select', 'overduehandling', get_string('overduehandling', 'quiz'),
quiz_get_overdue_handling_options());
$mform->addHelpButton('overduehandling', 'overduehandling', 'quiz');
$mform->setAdvanced('overduehandling', $quizconfig->overduehandling_adv);
$mform->setDefault('overduehandling', $quizconfig->overduehandling);
// TODO Formslib does OR logic on disableif, and we need AND logic here.