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

This commit is contained in:
Dan Poltawski
2014-03-04 15:43:23 +08:00
2 changed files with 8 additions and 4 deletions
+5 -2
View File
@@ -37,6 +37,9 @@ require_once($CFG->dirroot . '/mod/quiz/locallib.php');
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_quiz_mod_form extends moodleform_mod {
/** @var array options to be used with date_time_selector fields in the quiz. */
public static $datefieldoptions = array('optional' => true, 'step' => 1);
protected $_feedbacks;
protected static $reviewfields = array(); // Initialised in the constructor.
@@ -79,11 +82,11 @@ class mod_quiz_mod_form extends moodleform_mod {
// Open and close dates.
$mform->addElement('date_time_selector', 'timeopen', get_string('quizopen', 'quiz'),
array('optional' => true, 'step' => 1));
self::$datefieldoptions);
$mform->addHelpButton('timeopen', 'quizopenclose', 'quiz');
$mform->addElement('date_time_selector', 'timeclose', get_string('quizclose', 'quiz'),
array('optional' => true, 'step' => 1));
self::$datefieldoptions);
// Time limit.
$mform->addElement('duration', 'timelimit', get_string('timelimit', 'quiz'),
+3 -2
View File
@@ -27,6 +27,7 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/formslib.php');
require_once($CFG->dirroot . '/mod/quiz/mod_form.php');
/**
@@ -189,11 +190,11 @@ class quiz_override_form extends moodleform {
// Open and close dates.
$mform->addElement('date_time_selector', 'timeopen',
get_string('quizopen', 'quiz'), array('optional' => true));
get_string('quizopen', 'quiz'), mod_quiz_mod_form::$datefieldoptions);
$mform->setDefault('timeopen', $this->quiz->timeopen);
$mform->addElement('date_time_selector', 'timeclose',
get_string('quizclose', 'quiz'), array('optional' => true));
get_string('quizclose', 'quiz'), mod_quiz_mod_form::$datefieldoptions);
$mform->setDefault('timeclose', $this->quiz->timeclose);
// Time limit.