keep search string with initials links

Author: bluetom

classes/local/table/courses_in_step_table.php

@@ -42,6 +42,9 @@ class courses_in_step_table extends \table_sql {
     /** @var int|null if set, it is the courseid to focus on. */
     private $courseid;
 
+    /** @var string search string to filter courses list */
+    private $search = "";
+
     /**
      * Constructor for courses_in_step_table.
      * @param step_subplugin $step step to show courses of
@@ -87,6 +90,7 @@ public function __construct($step, $courseid, $ncourses = 0, $filterdata = '') {
             } else {
                 $where = $where . " AND ( c.fullname LIKE '%$filterdata%' OR c.shortname LIKE '%$filterdata%')";
             }
+            $this->search = $filterdata;
         }
 
         $this->column_nosort = ['status', 'tools'];
@@ -172,12 +176,12 @@ public function col_tools($row) {
         global $OUTPUT, $PAGE;
         $output = '';
         $output .= $OUTPUT->single_button(new \moodle_url($PAGE->url,
-            ['action' => 'rollback', 'processid' => $row->processid, 'sesskey' => sesskey()]),
-            get_string('rollback', 'tool_lifecycle')
+            ['action' => 'rollback', 'processid' => $row->processid, 'sesskey' => sesskey(), 'search' => $this->search]),
+            get_string('rollback', 'tool_lifecycle'), 'post', 'secondary', ['class' => 'mr-1']
         );
         $output .= $OUTPUT->single_button(new \moodle_url($PAGE->url,
-            ['action' => 'proceed', 'processid' => $row->processid, 'sesskey' => sesskey()]),
-            get_string('proceed', 'tool_lifecycle')
+            ['action' => 'proceed', 'processid' => $row->processid, 'sesskey' => sesskey(), 'search' => $this->search]),
+            get_string('proceed', 'tool_lifecycle'), 'post', 'secondary', ['class' => 'mt-1']
         );
         return $output;
     }

workflowoverview.php

@@ -88,6 +88,9 @@
 } else if ($excluded) {
     $params['excluded'] = $excluded;
 }
+if ($search) {
+    $params['search'] = $search;
+}
 
 $syscontext = context_system::instance();
 $PAGE->set_url(new \moodle_url(urls::WORKFLOW_DETAILS, $params));
@@ -177,7 +180,7 @@
     'move_down' => get_string('move_down', 'tool_lifecycle'),
 ];
 
-$nextrun = 0;
+$nextrun = false;
 $coursestriggered = [];
 $coursesdelayed = [];
 $displaytotaltriggered = false;
@@ -190,7 +193,7 @@
     $amounts = (new processor())->get_count_of_courses_to_trigger_for_workflow($workflow);
     $coursestriggered = $amounts['all']->coursestriggered;
     $coursesdelayed = $amounts['all']->delayedcourses;
-    $nextrun = $amounts['all']->nextrun;
+    $nextrun = $amounts['all']->nextrun == 0 ? false : $amounts['all']->nextrun;
     $displaytotaltriggered = !empty($triggers);
 }
 
@@ -204,9 +207,9 @@
 } else if ($nextrunt < time()) {
     $nextrunt = get_string('asap', 'tool_task');
 }
-if (is_int($nextrunt) && $nextrun ?? false) { // Task nextrun and trigger nextrun are valid times: take the minimum.
+if (is_int($nextrunt) && is_int($nextrun)) { // Task nextrun and trigger nextrun are valid times: take the minimum.
     $nextrun = userdate(min($nextrunt, $nextrun), get_string('strftimedatetimeshort', 'langconfig'));
-} else if (!is_int($nextrunt) && $nextrun ?? false) { // Only trigger nextrun is valid time.
+} else if (!is_int($nextrunt) && is_int($nextrun)) { // Only trigger nextrun is valid time.
     $nextrun = userdate($nextrun, get_string('strftimedatetimeshort', 'langconfig'));
 } else if (is_int($nextrunt)) { // Only task next run is valid time.
     $nextrun = userdate($nextrunt, get_string('strftimedatetimeshort', 'langconfig'));
@@ -480,7 +483,6 @@
         ['type' => settings_type::TRIGGER, 'wf' => $workflow->id]),
         'subplugin', $selectabletriggers, '', ['' => get_string('add_new_trigger_instance', 'tool_lifecycle')],
         null, ['id' => 'tool_lifecycle-choose-trigger']);
-
     // Add step selection field.
     if (!$newworkflow) { // At first select a course selection trigger, than you can select the first step.
         if ($steptypes = step_manager::get_step_types()) {