diff options
| author | Erich Eckner <git@eckner.net> | 2018-04-17 14:01:11 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-04-17 14:01:11 +0200 |
| commit | ba0bfb1336a9667ba1a9809f36bb684fc015dcd4 (patch) | |
| tree | 6e8e7465e114e003bd411626d4dce72424642292 | |
| parent | d71ef8a35787bce195db69e2e70e74032e6aa1d5 (diff) | |
| download | archweb32-ba0bfb1336a9667ba1a9809f36bb684fc015dcd4.tar.xz | |
buildmaster/build-slaves.php: check out persons for operator's name
| -rw-r--r-- | buildmaster/build-slaves.php | 6 |
1 files changed, 5 insertions, 1 deletions
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" . |