diff options
| author | Simon Rettberg | 2016-12-06 18:47:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-12-06 18:47:33 +0100 |
| commit | 3af2435ae31ab8580b453de36e7700cc75deee31 (patch) | |
| tree | fcc3c6a53e4d9ecb3667871557332fbd4246ba9f | |
| parent | [statistics/locations/..] Cache calculated locationid of machine in machine t... (diff) | |
| download | slx-admin-3af2435ae31ab8580b453de36e7700cc75deee31.tar.gz slx-admin-3af2435ae31ab8580b453de36e7700cc75deee31.tar.xz slx-admin-3af2435ae31ab8580b453de36e7700cc75deee31.zip | |
[roomplanner] Update locationid -> fixedlocationid
| -rw-r--r-- | modules-available/roomplanner/inc/pvsgenerator.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/roomplanner/page.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/roomplanner/inc/pvsgenerator.inc.php b/modules-available/roomplanner/inc/pvsgenerator.inc.php index 063c748d..af090fc3 100644 --- a/modules-available/roomplanner/inc/pvsgenerator.inc.php +++ b/modules-available/roomplanner/inc/pvsgenerator.inc.php @@ -145,7 +145,7 @@ class PvsGenerator private static function getMachines($roomid) { $ret = Database::simpleQuery( - 'SELECT clientip, position FROM machine WHERE locationid = :locationid', + 'SELECT clientip, position FROM machine WHERE fixedlocationid = :locationid', ['locationid' => $roomid]); $machines = array(); diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php index c03b69d0..de82a985 100644 --- a/modules-available/roomplanner/page.inc.php +++ b/modules-available/roomplanner/page.inc.php @@ -228,7 +228,7 @@ class Page_Roomplanner extends Page protected function getMachinesOnPlan($tutorUuid) { - $result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname, position FROM machine WHERE locationid = :locationid', + $result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname, position FROM machine WHERE fixedlocationid = :locationid', ['locationid' => $this->locationid]); $machines = []; while ($row = $result->fetch(PDO::FETCH_ASSOC)) { |