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

nilo72 · Jan 15, 2018 · 110965a · 110965a
2 parents a7db60d + dccd954
commit 110965a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/completion/classes/edit_base_form.php b/completion/classes/edit_base_form.php
@@ -220,7 +220,7 @@ public function definition() {
         }
 
         // 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);

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
@@ -710,7 +710,8 @@ function standard_coursemodule_elements(){
             }
 
             // 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);
         }