From 5ecbde8ac14bc17170f27ace3edd858ce575e922 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 25 May 2018 16:02:28 +0200 Subject: buildmaster/log.php: add filter for build slave --- buildmaster/log.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildmaster/log.php b/buildmaster/log.php index 477d4c9..55ce955 100644 --- a/buildmaster/log.php +++ b/buildmaster/log.php @@ -13,8 +13,10 @@ "parameters" => "`ssh_log`.`parameters`" ); $join = " LEFT JOIN `build_slaves` ON `ssh_log`.`build_slave`=`build_slaves`.`id`"; - if (isset($_GET["filter"])) - $filter = " AND `ssh_log`.`action` LIKE from_base64(\"" . base64_encode($_GET["filter"]) . "\")"; + if (isset($_GET["action"])) + $filter .= " AND `ssh_log`.`action` LIKE from_base64(\"" . base64_encode($_GET["action"]) . "\")"; + if (isset($_GET["slave"])) + $filter .= " AND `build_slaves`.`name` LIKE from_base64(\"" . base64_encode($_GET["slave"]) . "\")"; } else { $to_show = "email"; $columns = array( -- cgit v1.2.3-70-g09d2