L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61205_m35v1' of git://github.com/sbourget/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2018-01-15 14:17:01 +08:00
parent a7db60dcf1 dccd9540d0
commit 110965aecd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
completion/classes/edit_base_form.php
+1 -1
View File
@@ -220,7 +220,7 @@ abstract class core_completion_edit_base_form extends moodleform {
}
// Completion expected at particular date? (For progress tracking).
$mform->addElement('date_selector', 'completionexpected',
$mform->addElement('date_time_selector', 'completionexpected',
get_string('completionexpected', 'completion'), ['optional' => true]);
$mform->addHelpButton('completionexpected', 'completionexpected', 'completion');
$mform->disabledIf('completionexpected', 'completion', 'eq', COMPLETION_TRACKING_NONE);
course/moodleform_mod.php
+2 -1
View File
@@ -710,7 +710,8 @@ abstract class moodleform_mod extends moodleform {
}
// Completion expected at particular date? (For progress tracking)
$mform->addElement('date_selector', 'completionexpected', get_string('completionexpected', 'completion'), array('optional'=>true));
$mform->addElement('date_time_selector', 'completionexpected', get_string('completionexpected', 'completion'),
array('optional' => true));
$mform->addHelpButton('completionexpected', 'completionexpected', 'completion');
$mform->disabledIf('completionexpected', 'completion', 'eq', COMPLETION_TRACKING_NONE);
}