You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2011/04/28 17:30:00 UTC
svn commit: r1097504 - in /incubator/vcl/trunk/web/.ht-inc: errors.php
statistics.php vm.php
Author: jfthomps
Date: Thu Apr 28 15:29:59 2011
New Revision: 1097504
URL: http://svn.apache.org/viewvc?rev=1097504&view=rev
Log:
minor changes to errors.php and statistics.php
vm.php: modified AJnewProfile - get imageid for 'noimage' before doing insert instead of hard coding image id 4
Modified:
incubator/vcl/trunk/web/.ht-inc/errors.php
incubator/vcl/trunk/web/.ht-inc/statistics.php
incubator/vcl/trunk/web/.ht-inc/vm.php
Modified: incubator/vcl/trunk/web/.ht-inc/errors.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/errors.php?rev=1097504&r1=1097503&r2=1097504&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/errors.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/errors.php Thu Apr 28 15:29:59 2011
@@ -121,7 +121,7 @@ $ERRORS = array (
"228" => "Failed to execute query 4 in acknowledgeRequest",
"229" => "Failed to execute query 5 in acknowledgeRequest",
"235" => "Failed to execute query 1 in submitAddBulkComputers",
- "238" => "Failed to execute query 3 in submitAddBulkComputers",
+ "238" => "Failed to execute query 2 in submitAddBulkComputers",
"240" => "Failed to execute query 1 in addUser",
"241" => "Failed to execute query 2 in addUser",
"242" => "Failed to fetch last insert id in addUser",
Modified: incubator/vcl/trunk/web/.ht-inc/statistics.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/statistics.php?rev=1097504&r1=1097503&r2=1097504&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/statistics.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/statistics.php Thu Apr 28 15:29:59 2011
@@ -995,7 +995,7 @@ function getStatGraphConVMUserData($star
. "s.computerid = c.id AND "
. "l.wasavailable = 1 AND "
. "c.type = 'virtualmachine' AND "
- . "l.userid != $reloadid";
+ . "l.userid != $reloadid";
}
$qh = doQuery($query, 101);
while($row = mysql_fetch_assoc($qh)) {
Modified: incubator/vcl/trunk/web/.ht-inc/vm.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/vm.php?rev=1097504&r1=1097503&r2=1097504&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/vm.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/vm.php Thu Apr 28 15:29:59 2011
@@ -849,7 +849,8 @@ function AJnewProfile() {
sendJSON(array('failed' => 'exists'));
return;
}
- $query = "INSERT INTO vmprofile (profilename, vmtypeid, imageid) VALUES ('$newprofile',1,4)";
+ $imageid = getImageId('noimage');
+ $query = "INSERT INTO vmprofile (profilename, vmtypeid, imageid) VALUES ('$newprofile', 1, $imageid)";
doQuery($query, 101);
$qh = doQuery("SELECT LAST_INSERT_ID() FROM vmprofile", 101);
$row = mysql_fetch_row($qh);