From ba0bfb1336a9667ba1a9809f36bb684fc015dcd4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 17 Apr 2018 14:01:11 +0200 Subject: buildmaster/build-slaves.php: check out persons for operator's name --- buildmaster/build-slaves.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php index e3bf2a3..73aa96a 100644 --- a/buildmaster/build-slaves.php +++ b/buildmaster/build-slaves.php @@ -5,12 +5,16 @@ $result = mysql_run_query( "SELECT" . " `build_slaves`.`name`," . - "`build_slaves`.`operator`," . + "`persons`.`name` AS `operator`," . "`package_sources`.`pkgbase`," . "`build_slaves`.`last_connection`," . "`build_slaves`.`logged_lines`," . "`build_slaves`.`last_action`" . " FROM `build_slaves`" . + " JOIN `ssh_keys` ON" . + " `build_slaves`.`ssh_key`=`ssh_keys`.`id`" . + " JOIN `persons` ON" . + " `ssh_keys`.`owner`=`persons`.`id`" . " LEFT JOIN `build_assignments` ON" . " `build_slaves`.`currently_building`=`build_assignments`.`id`" . " LEFT JOIN `package_sources` ON" . -- cgit v1.2.3-70-g09d2