Rebased/moodle 405 stable catalyst

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-> **Note:** Please fill out all required sections and remove irrelevant ones.
+> **Note:** Please fill out all relevant sections and remove irrelevant ones.
 ### 🔀 Purpose of this PR:
 
 - [ ] Fixes a bug

.github/workflows/config.json

@@ -1,16 +1,33 @@
 {
+  "moodle-plugin-ci": "4.5.6",
   "main-moodle": "MOODLE_405_STABLE",
   "main-php": "8.3",
   "main-db": "pgsql",
   "moodle-testmatrix": {
     "MOODLE_401_STABLE": {
-      "php": ["8.0", "8.1"],
-      "db": ["pgsql", "mariadb", "mysqli"]
+      "php": [
+        "8.0",
+        "8.1"
+      ]
+    },
+    "MOODLE_404_STABLE": {
+      "php": [
+        "8.1",
+        "8.2",
+        "8.3"
+      ]
     },
     "MOODLE_405_STABLE": {
-     "php": ["8.1", "8.2", "8.3"],
-      "db": ["pgsql", "mariadb", "mysqli"]
+      "php": [
+        "8.1",
+        "8.2",
+        "8.3"
+      ],
+      "db": [
+        "pgsql",
+        "mariadb",
+        "mysqli"
+      ]
     }
-  },
-  "moodle-plugin-ci": "4.4.5"
+  }
 }

.github/workflows/config_dev.json

@@ -0,0 +1,18 @@
+{
+  "moodle-plugin-ci": "4.5.6",
+  "main-moodle": "MOODLE_405_STABLE",
+  "main-php": "8.3",
+  "main-db": "pgsql",
+  "moodle-testmatrix": {
+    "MOODLE_405_STABLE": {
+      "php": [
+        "8.3"
+      ],
+      "db": [
+        "pgsql",
+        "mariadb",
+        "mysqli"
+      ]
+    }
+  }
+}

.github/workflows/config_publish.json

@@ -0,0 +1,33 @@
+{
+  "moodle-plugin-ci": "4.5.6",
+  "main-moodle": "MOODLE_405_STABLE",
+  "main-php": "8.3",
+  "main-db": "pgsql",
+  "moodle-testmatrix": {
+    "MOODLE_401_STABLE": {
+      "php": [
+      "8.0",
+      "8.1"
+      ]
+    },
+    "MOODLE_404_STABLE": {
+      "php": [
+        "8.1",
+        "8.2",
+        "8.3"
+      ]
+    },
+    "MOODLE_405_STABLE": {
+      "php": [
+        "8.1",
+        "8.2",
+        "8.3"
+      ],
+      "db": [
+        "pgsql",
+        "mariadb",
+        "mysqli"
+      ]
+    }
+  }
+}

CHANGES.md

@@ -1,6 +1,67 @@
 CHANGELOG
 =========
 
+Further information to the latest changes can be found here: https://github.com/learnweb/moodle-tool_lifecycle/wiki/Changes-of-version-4.5.4-and-4.5.5
+and here: https://github.com/learnweb/moodle-tool_lifecycle/wiki/Changes-of-version-4.5-in-detail
+
+4.5.5 (2025-02-10)
+------------------
+* [FIXED] Problems with check_course_code
+* [FIXED] Display time as usertime, not UTC (Issue #188)
+* [FEATURE] A lack of capability is now the only reason not to render the manage courses sec nav link issue #198
+* [FIXED] Fix unit test PR #230
+* [FIXED] Workflowoverview Course selection: show run-link only when workflow is active
+* [FEATURE] Display error time in errors table
+* [FEATURE] Provide possibility to delete invalid/outdated process error entries
+* [FEATURE] Lifecycle Task: trace course processing as well, Trigger categories: improve cat listing in frozen edit form
+* [FIXED] Fix missing course error when aborting processes after course deletion
+* [FEATURE] New lib function multiple_use() makes a trigger type choosable for a single workflow n-times
+* [FEATURE] Introduce a step option to define an individual target step in case of rollback (issue #213)
+* [FEATURE] EXPERIMENTAL: Trigger selection sql - conjunction(AND) and disjunction(OR) now possible (workflow option)
+* [FEATURE] Refactor last access trigger: no single course ids in sql (issue #243)
+* [FEATURE] Subplugins both ways of describing following MDL-83705 (issue #249)
+* [FEATURE] Introduce new lib function check_course_code to force using function check_course for every course candidate (issue #243)
+* [FIXED] Workflows with triggers which have more than 65.535 paramaters throw an error (issue #243)
+* [FEATURE] Display trigger counting partial as tooltip; show courses already part of the workflow process or the process errors
+* [FEATURE] Workflowoverview: show also '0' courses in exclude trigger. Make instancenames in supplugin form of active workflows static
+* [FIXED] proceed, rollback event: take course context when context is missing
+* [FIXED] Fix trigger customfielddelay's missing field error message
+* [FEATURE] Delete all delays: show amount of delays that would be deleted next to button
+* [FEATURE] Workflowoverview: exclude trigger: show excluded 0 as well
+* [FIXED] prozessor.php: restore version 4.5 of function process_courses
+* [FIXED] prozessor.php: restore version 4.5 of function call_trigger
+* [FEATURE] Workflowoverview: place new link to run lifecycle task in timetrigger row
+* [FIXED] Fix step email context course id error
+* [FIXED] call_trigger: mtrace only when called by cron
+* [FIXED] Fix behat tests interaction.feature and manual_trigger.feature
+* [FIXED] Step libs' function process_course error: make sure course is of type stdClass
+* [FIXED] Fix unit test process_error_test
+* [FEATURE] Add additional jobs to run in ci-file
+* [FIXED] Fixed error occurring when renaming field manual to manually during the upgrade
+
+4.5.4 (2025-06-23)
+------------------
+* [FEATURE] No php notice if string plugindescription is missing
+* [FIXED] Fix adminapprove sql error single approve
+* [FIXED] catch/prevent missing workflow error
+* [FIXED] Fix uploadworkflow wrong redirect
+* [FEATURE] Workflowoverview: show also delayed trigger courses but only when still in delay
+* [FEATURE] Shift showdetails icon to block trigger
+* [FEATURE] activestep.php: make approval tab an active link
+* [FEATURE] Exclude trigger customfieldsemester from git
+* [FIXED] mtrace processes without workflow and delete processes of removed courses
+* [FEATURE] Remove customfield_semester dependency
+* [FIXED] Improve display of next run time
+* [FEATURE] Trigger byrole: introduce invert function
+* [FEATURE] Prevent deleting course 1
+* [FEATURE] Add step movecategory
+* [FEATURE] Add trigger lastaccess
+* [FIXED] Fix lastaccess error when no courses found
+* [FEATURE] Add filter form to procerror page
+* [FEATURE] Categories trigger: instance settings should not be editable
+* [FEATURE] Shift subplugins list to own page
+* [FIXED] DB field 'manual' now reserved word in mysql version 8.4, change to 'manually'
+
 4.5.0 (2025-05-04)
 ------------------
 * [FEATURE] Workflowoverview: Added possibility to select single courses for process

README.md

@@ -20,20 +20,19 @@ To be adaptable to the needs of different institutions the plugin provides two s
 
 ## Subplugins
 Requirements that are specific to your institution can be added through additional subplugins.
-A list of all subplugins and more information can be found in the [Wiki](https://github.com/learnweb/moodle-tool_lifecycle/wiki/List-of-Additional-Subplugins) ([subpluginslist](https://github.com/learnweb/moodle-tool_lifecycle/wiki/List-of-Additional-Subplugins)).
+A list of all subplugins and more information can be found in the [Wiki](https://github.com/learnweb/moodle-tool_lifecycle/wiki) ([subpluginslist](https://github.com/learnweb/moodle-tool_lifecycle/wiki/List-of-Installed-Subplugins)).
 It provides instructions for administrators as well as for developers to implement their own requirements into subplugins.
 
 Installation
 ============
 This is an admin plugin and should go into ``admin/tool/lifecycle``.
+
+In the current Lifecycle version 4.5.5 (v4.5-r6), it may be necessary to delete the old directory admin/tool/lifecycle and
+clone the new version with Git. This should be possible without any issues, as no user data is stored in that directory.  ==> But be aware: If you are using the customfieldsemester trigger or other special triggers and steps, or if you have made local
+changes to the included triggers or steps you would need to save them before installation and copy them into the new directory afterwards.
+
 Obtain this plugin from https://moodle.org/plugins/view/tool_lifecycle.
 
 Moodle version
 ==============
-The plugin is continously tested with all moodle versions, which are security supported by the moodle headquarter.
-Therefore, Travis uses the most current release to build a test instance and run the behat and unit tests on them.
-In addition to all stable branches the version is tested against the master branch to support early adopters.
-
-Changelog
-=========
-The changes for every release are listed here: https://github.com/learnweb/moodle-tool_lifecycle/wiki/Change-log.
+The plugin is continuously tested with all moodle versions, which are security supported by the moodle headquarter.

activeprocesses.php

@@ -31,8 +31,7 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
 
-require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_admin();
 
 $syscontext = context_system::instance();
 $PAGE->set_url(new \moodle_url(urls::ACTIVE_PROCESSES));
@@ -71,7 +70,9 @@
 
 $heading = get_string('pluginname', 'tool_lifecycle')." / ".get_string('find_course_list_header', 'tool_lifecycle');
 echo $renderer->header($heading);
-$tabrow = tabs::get_tabrow(true);
+$tabparams = new stdClass();
+$tabparams->activelink = true;
+$tabrow = tabs::get_tabrow($tabparams);
 $id = 'activeworkflows';
 $renderer->tabs($tabrow, $id);
 

activeworkflows.php

@@ -32,8 +32,7 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
 
-require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_admin();
 
 $syscontext = context_system::instance();
 $PAGE->set_url(new \moodle_url(urls::ACTIVE_WORKFLOWS));

classes/event/process_proceeded.php

@@ -23,6 +23,7 @@
  */
 namespace tool_lifecycle\event;
 
+use context_course;
 use moodle_url;
 use tool_lifecycle\local\entity\process;
 
@@ -54,7 +55,7 @@ class process_proceeded extends \core\event\base {
     public static function event_from_process($process) {
         $data = [
                 'courseid' => $process->courseid,
-                'context' => $process->context,
+                'context' => $process->context ?? context_course::instance($process->courseid),
                 'other' => [
                         'processid' => $process->id,
                         'workflowid' => $process->workflowid,

classes/event/process_rollback.php

@@ -24,6 +24,7 @@
 
 namespace tool_lifecycle\event;
 
+use context_course;
 use moodle_url;
 use tool_lifecycle\local\entity\process;
 
@@ -45,7 +46,7 @@
 class process_rollback extends \core\event\base {
 
     /**
-     * Creates an process_rollabck event from a process.
+     * Creates an process_rollback event from a process.
      *
      * @param process $process
      * @return process_rollback
@@ -55,7 +56,7 @@ class process_rollback extends \core\event\base {
     public static function event_from_process($process) {
         $data = [
                 'courseid' => $process->courseid,
-                'context' => $process->context,
+                'context' => $process->context ?? context_course::instance($process->courseid),
                 'other' => [
                         'processid' => $process->id,
                         'workflowid' => $process->workflowid,
@@ -142,4 +143,5 @@ public static function get_other_mapping() {
         // No backup and restore.
         return false;
     }
+
 }

classes/local/backup/restore_lifecycle_workflow.php

@@ -203,7 +203,7 @@ private function check_subplugin_validity() {
         }
 
         foreach ($this->trigger as $trigger) {
-            $steplib = lib_manager::get_trigger_lib($trigger->subpluginname);
+            $triggerlib = lib_manager::get_trigger_lib($trigger->subpluginname);
             $filteredsettings = [];
             foreach ($this->settings as $setting) {
                 if ($setting->pluginid === $trigger->id) {
@@ -212,7 +212,7 @@ private function check_subplugin_validity() {
             }
             $errors = array_map(
                     fn($x) => get_string('restore_error_in_trigger', 'tool_lifecycle', $trigger->instancename) . $x,
-                    $steplib->ensure_validity($filteredsettings)
+                    $triggerlib->ensure_validity($filteredsettings)
             );
             $this->errors = array_merge($this->errors, $errors);
         }

classes/local/entity/process.php

@@ -80,16 +80,17 @@ private function __construct($id, $workflowid, $courseid, $context, $stepindex,
     /**
      * Creates a Life Cycle Process from a db record.
      * @param object $record Data object.
+     * @param bool $coursedeleted If course is deleted no context can be fetched
      * @return process
      */
-    public static function from_record($record) {
+    public static function from_record($record, $coursedeleted = false) {
         if (!object_property_exists($record, 'id')) {
             return null;
         }
         if (!object_property_exists($record, 'workflowid')) {
             return null;
         }
-        if (!object_property_exists($record, 'courseid')) {
+        if (!object_property_exists($record, 'courseid') || !is_numeric($record->courseid)) {
             return null;
         }
         if (object_property_exists($record, 'waiting') && $record->waiting) {
@@ -104,7 +105,11 @@ public static function from_record($record) {
             $stepindex = 0;
         }
 
-        $context = \context_course::instance($record->courseid);
+        if (!$coursedeleted) {
+            $context = \context_course::instance($record->courseid);
+        } else {
+            $context = "";
+        }
         $instance = new self($record->id,
                 $record->workflowid,
                 $record->courseid,

classes/local/entity/step_subplugin.php

@@ -32,6 +32,9 @@
  */
 class step_subplugin extends subplugin {
 
+    /** @var int $rollbacktosortindex the stepindex of the step to which the current step has to be rolled back */
+    public $rollbacktosortindex;
+
     /**
      * Creates a subplugin from a db record.
      * @param object $record Data object.
@@ -55,6 +58,9 @@ public static function from_record($record) {
         if (object_property_exists($record, 'sortindex') ) {
                 $instance->sortindex = $record->sortindex;
         }
+        if (object_property_exists($record, 'rollbacktosortindex') ) {
+            $instance->rollbacktosortindex = $record->rollbacktosortindex;
+        }
 
         return $instance;
     }