Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated history filter to allow 0th step to be handled #188

Merged
merged 1 commit into from
May 31, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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