From 3af2435ae31ab8580b453de36e7700cc75deee31 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Dec 2016 18:47:33 +0100
Subject: [roomplanner] Update locationid -> fixedlocationid

---
 modules-available/roomplanner/inc/pvsgenerator.inc.php | 2 +-
 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)) {
-- 
cgit v1.2.3-55-g7522