Skip to content

Commit

Permalink
Merge pull request #188 from catalyst/filter-step0
Browse files Browse the repository at this point in the history
Updated history filter to allow 0th step to be handled
  • Loading branch information
keevan authored May 31, 2022
2 parents e3c3e96 + 96a0209 commit a7e0b81
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions classes/output/workflowhistory/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])) {
Expand All @@ -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) {
Expand Down

0 comments on commit a7e0b81

Please sign in to comment.