diff --git a/webroot/classes/game.php b/webroot/classes/game.php index f0cb4a1a079378c368f0f0306175fb0e6cb55570..0cd5c3007642d671125936cdaf32ec3be74beda6 100644 --- a/webroot/classes/game.php +++ b/webroot/classes/game.php @@ -80,10 +80,13 @@ class Game extends Record { DATEDIFF(l.end_date, curdate()) ELSE l.id - END AS loan_status + END AS loan_status, + m.id AS member_id, + CONCAT(m.firstname, ' ', m.lastname) AS member_name FROM ".Game::$table." g LEFT OUTER JOIN ".Esar_Category::$table." ec ON g.esar_category_id = ec.id LEFT OUTER JOIN ".Loan::$table." l ON (g.id = l.game_id AND l.is_back = 0) + LEFT OUTER JOIN ".Member::$table." m ON (l.member_id = m.id) $where_clause ORDER BY g.name"; $GLOBALS["data"]->select($sql, $games, "Game"); diff --git a/webroot/views/games/list.html b/webroot/views/games/list.html index 8bf2a8ed643cae7282edb191e6a80be4e8d98041..749df1095def5ff438a7a50e2021a6aca9637ad7 100644 --- a/webroot/views/games/list.html +++ b/webroot/views/games/list.html @@ -28,6 +28,7 @@