Merge pull request #180 from aneno-m-e/copy-default-on-course-creation

Disable by default if course has no recompletion settings and prevent reset when recompletion is disabled in course
danmarsden · Jul 17, 2024 · 9853042 · 9853042
2 parents 0844489 + 0ff76ed
commit 9853042
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/classes/recompletion_form.php b/classes/recompletion_form.php
@@ -64,7 +64,7 @@ public function definition() {
             self::RECOMPLETION_TYPE_ONDEMAND => get_string('recompletiontype:ondemand', 'local_recompletion'),
             self::RECOMPLETION_TYPE_SCHEDULE => get_string('recompletiontype:schedule', 'local_recompletion'),
         ]);
-        $mform->setDefault('recompletiontype', $config->recompletiontype ?? '');
+        $mform->setDefault('recompletiontype', RECOMPLETION_TYPE_DISABLED);
         $mform->addHelpButton('recompletiontype', 'recompletiontype', 'local_recompletion');
 
         $mform->addElement('checkbox', 'recompletionemailenable', get_string('recompletionemailenable', 'local_recompletion'));

diff --git a/classes/task/check_recompletion.php b/classes/task/check_recompletion.php
@@ -259,6 +259,7 @@ public function reset_user($userid, $course, $config = null) {
         }
         if (empty($config->recompletiontype)) {
             $errors[] = get_string('recompletionnotenabledincourse', 'local_recompletion', $course->id);
+            return $errors;
         }
 
         $restrictions = local_recompletion_get_supported_restrictions();