summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-08 11:08:21 +0200
committerSimon Rettberg2016-09-08 11:08:21 +0200
commit475d328960a7e4c4545b595b4783ee59226cb0e9 (patch)
tree9dbf1fa80c8d726f4b33c467d21e3608e52302ad
parent[roomplanner] Move pvs generator to api; skip empty rooms; add phpdoc (diff)
downloadslx-admin-475d328960a7e4c4545b595b4783ee59226cb0e9.tar.gz
slx-admin-475d328960a7e4c4545b595b4783ee59226cb0e9.tar.xz
slx-admin-475d328960a7e4c4545b595b4783ee59226cb0e9.zip
[roomplanner] Fix key constraint error on room saving
-rw-r--r--modules-available/roomplanner/page.inc.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 5c58789c..ecbf9d1f 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -87,15 +87,6 @@ class Page_Roomplanner extends Page
if ($this->action === 'getmachines') {
$query = Request::get('query', false, 'string');
- /* the query could be anything: UUID, IP or macaddr */
-// $result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname '
-// . ', MATCH (machineuuid, macaddr, clientip, hostname) AGAINST (:query) AS relevance '
-// . 'FROM machine '
-// . 'WHERE MATCH (machineuuid, macaddr, clientip, hostname) AGAINST (:query) '
-// . 'ORDER BY relevance DESC '
-// . 'LIMIT 5'
-// , ['query' => $query]);
-//
$result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname '
. 'FROM machine '
. 'WHERE machineuuid LIKE :query '
@@ -204,7 +195,7 @@ class Page_Roomplanner extends Page
'locationid' => $this->locationid,
'roomplan' => $obj,
'managerip' => Request::post('managerip', '', 'string'),
- 'tutoruuid' => '' // TODO
+ 'tutoruuid' => null // TODO
]);
}