Author: jfthomps
Date: Thu Aug 20 17:18:03 2015
New Revision: 1696823
URL: http://svn.apache.org/r1696823
Log:
VCL-861 - Web timetable endless loop
utils.php: modified findAvailableTimes: added conditional to all queries on the
computer table that makes sure computer is not a VM or that the vmhostid field
is not null
Modified:
vcl/trunk/web/.ht-inc/utils.php
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1696823&r1=1696822&r2=1696823&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Thu Aug 20 17:18:03 2015
@@ -7703,6 +7703,7 @@ function findAvailableTimes($start, $end
. "o.installtype = oi.name AND "
. "oi.id = poi.OSinstalltypeid AND "
. "poi.provisioningid = c.provisioningid AND "
+ . "(c.type != 'virtualmachine' OR c.vmhostid IS NOT NULL)
AND "
. "c.RAM >= i.minram AND "
. "c.procnumber >= i.minprocnumber AND "
. "c.procspeed >= i.minprocspeed AND "
@@ -7760,6 +7761,7 @@ function findAvailableTimes($start, $end
. "o.installtype = oi.name AND "
. "oi.id = poi.OSinstalltypeid AND "
. "poi.provisioningid = c.provisioningid AND "
+ . "(c.type != 'virtualmachine' OR c.vmhostid IS
NOT NULL) AND "
. "c.RAM >= i.minram AND "
. "c.procnumber >= i.minprocnumber AND "
. "c.procspeed >= i.minprocspeed AND "
@@ -7822,6 +7824,7 @@ function findAvailableTimes($start, $end
. "o.installtype = oi.name AND "
. "oi.id = poi.OSinstalltypeid AND "
. "poi.provisioningid = c.provisioningid AND "
+ . "(c.type != 'virtualmachine' OR c.vmhostid IS NOT NULL)
AND "
. "c.RAM >= i.minram AND "
. "c.procnumber >= i.minprocnumber AND "
. "c.procspeed >= i.minprocspeed AND "
@@ -7876,6 +7879,7 @@ function findAvailableTimes($start, $end
. "o.installtype = oi.name AND "
. "oi.id = poi.OSinstalltypeid AND "
. "poi.provisioningid = c.provisioningid AND "
+ . "(c.type != 'virtualmachine' OR c.vmhostid IS NOT NULL)
AND "
. "c.RAM >= i.minram AND "
. "c.procnumber >= i.minprocnumber AND "
. "c.procspeed >= i.minprocspeed AND "
