Merge pull request #123 from catalyst/bugfixes-41

Bugfixes 41

Author: matthewhilton

.github/workflows/ci.yml

@@ -1,7 +1,11 @@
-name: Run all tests for Moodle 4.0+
+name: ci
 
 on: [push, pull_request]
 
 jobs:
-  workflow_group_40_plus_ci:
-    uses: catalyst/catalyst-moodle-workflows/.github/workflows/group-40-plus-ci.yml@main
+  ci:
+    uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main
+    with:
+      disable_behat: true
+      disable_grunt: true
+      disable_phpcpd: true

lib.php

@@ -123,6 +123,10 @@ function observation_supports($feature) {
             return true;
         case FEATURE_BACKUP_MOODLE2:
             return true;
+        // Activity plugins default this to true, so explicity set to false.
+        // Since it is not supported by mod_observation.
+        case FEATURE_MOD_INTRO:
+            return false;
         default:
             return null;
     }

mod_form.php

@@ -79,12 +79,17 @@ public function data_preprocessing(&$defaultvalues) {
         }
 
         // Editing, find the defaults and update the form values.
-        $obsdata = $DB->get_record('observation', array('id' => $obsid));
+        $obsdata = (object) $DB->get_record('observation', array('id' => $obsid));
 
-        $defaultvalues['observerins_editor']->text = $obsdata->observer_ins;
-        $defaultvalues['observerins_editor']->format = $obsdata->observer_ins_f;
-        $defaultvalues['observeeins_editor']->text = $obsdata->observee_ins;
-        $defaultvalues['observeeins_editor']->format = $obsdata->observee_ins_f;
+        $defaultvalues['observerins_editor'] = (object) [
+            'text' => $obsdata->observer_ins,
+            'format' => $obsdata->observer_ins_f
+        ];
+
+        $defaultvalues['observeeins_editor'] = (object) [
+            'text' => $obsdata->observee_ins,
+            'format' => $obsdata->observee_ins_f
+        ];
 
         return;
     }

version.php

@@ -30,3 +30,4 @@
 $plugin->requires  = 2022041900;
 $plugin->component = 'mod_observation';
 $plugin->maturity = MATURITY_STABLE;
+$plugin->supported = [40, 41];