Merge pull request #188 from catalyst/filter-step0

keevan · web-flow · commit a7e0b8132451 · 2022-06-01T09:51:13.000+10:00
Updated history filter to allow 0th step to be handled
diff --git a/classes/output/workflowhistory/renderer.php b/classes/output/workflowhistory/renderer.php
@@ -104,7 +104,7 @@ public function render_workflowhistory_table($workflowid, $searchparams = [], $d
         $statuswhere = [];
         if (!empty($searchparams['filterpassed'])) {
             $sqlparams['filterpassed'] = $searchparams['filterpassed'];
-            $statuswhere[] = ' ((tfh.failedstep = 0 OR tfh.failedstep IS NULL) AND (tfh.errorstep = 0 OR tfh.errorstep IS NULL))';
+            $statuswhere[] = ' ((tfh.failedstep IS NULL) AND (tfh.errorstep IS NULL))';
         }
 
         if (!empty($searchparams['filtercancelled'])) {
@@ -119,12 +119,12 @@ public function render_workflowhistory_table($workflowid, $searchparams = [], $d
 
         if (!empty($searchparams['filtererrored'])) {
             $sqlparams['filtererrored'] = $searchparams['filtererrored'];
-            $statuswhere[] = ' (tfh.errorstep > 0) ';
+            $statuswhere[] = ' (tfh.errorstep IS NOT NULL) ';
         }
 
         if (!empty($searchparams['filterfailed'])) {
             $sqlparams['filterfailed'] = $searchparams['filterfailed'];
-            $statuswhere[] = ' (tfh.failedstep > 0) ';
+            $statuswhere[] = ' (tfh.failedstep IS NOT NULL) ';
         }
 
         if (count($statuswhere) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function render_workflowhistory_table($workflowid, $searchparams = [], $d`
`104`	`104`	`$statuswhere = [];`
`105`	`105`	`if (!empty($searchparams['filterpassed'])) {`
`106`	`106`	`$sqlparams['filterpassed'] = $searchparams['filterpassed'];`
`107`		`- $statuswhere[] = ' ((tfh.failedstep = 0 OR tfh.failedstep IS NULL) AND (tfh.errorstep = 0 OR tfh.errorstep IS NULL))';`
	`107`	`+ $statuswhere[] = ' ((tfh.failedstep IS NULL) AND (tfh.errorstep IS NULL))';`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if (!empty($searchparams['filtercancelled'])) {`
`@@ -119,12 +119,12 @@ public function render_workflowhistory_table($workflowid, $searchparams = [], $d`
`119`	`119`
`120`	`120`	`if (!empty($searchparams['filtererrored'])) {`
`121`	`121`	`$sqlparams['filtererrored'] = $searchparams['filtererrored'];`
`122`		`- $statuswhere[] = ' (tfh.errorstep > 0) ';`
	`122`	`+ $statuswhere[] = ' (tfh.errorstep IS NOT NULL) ';`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`if (!empty($searchparams['filterfailed'])) {`
`126`	`126`	`$sqlparams['filterfailed'] = $searchparams['filterfailed'];`
`127`		`- $statuswhere[] = ' (tfh.failedstep > 0) ';`
	`127`	`+ $statuswhere[] = ' (tfh.failedstep IS NOT NULL) ';`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if (count($statuswhere) > 0) {`