Author: jfthomps
Date: Mon May 21 19:00:34 2012
New Revision: 1341146
URL: http://svn.apache.org/viewvc?rev=1341146&view=rev
Log:
VCL-576
Finalizing for 2.3 release
requests.php: modified viewRequests - disallowed reboot and reinstall when a
reservation is in the reboot or reinstall state
vm.php: removed an old TODO comment
vm.js: modified newProfileCB - set mouse cursor to default if get a failed error
Modified:
incubator/vcl/trunk/web/.ht-inc/requests.php
incubator/vcl/trunk/web/.ht-inc/vm.php
incubator/vcl/trunk/web/js/vm.js
Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=1341146&r1=1341145&r2=1341146&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Mon May 21 19:00:34 2012
@@ -850,7 +850,6 @@ function viewRequests() {
$reqids[] = $requests[$i]['id'];
$imageid = $requests[$i]["imageid"];
$text .= " <TR valign=top
id=reqrow{$requests[$i]['id']}>\n";
- # TODO probably should display current status somewhere
if checkpointing, rebooting, or reinstalling
if(requestIsReady($requests[$i]) &&
$requests[$i]['useraccountready']) {
$connect = 1;
# request is ready, print Connect! and End
buttons
@@ -980,10 +979,10 @@ function viewRequests() {
$requests[$i]['laststateid'] != 24 &&
$requests[$i]['currstateid'] != 16 &&
$requests[$i]['laststateid'] != 16 &&
- /*$requests[$i]['currstateid'] != 26
&& # TODO do we allow reboots again if already in reboot state?
+ $requests[$i]['currstateid'] != 26 &&
$requests[$i]['laststateid'] != 26 &&
$requests[$i]['currstateid'] != 28 &&
- $requests[$i]['laststateid'] !=
28 &&*/
+ $requests[$i]['laststateid'] !=
28 &&
$requests[$i]['currstateid'] != 27 &&
$requests[$i]['laststateid'] != 27) {
$cont =
addContinuationsEntry('AJrebootRequest', $cdata, SECINDAY);
Modified: incubator/vcl/trunk/web/.ht-inc/vm.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/vm.php?rev=1341146&r1=1341145&r2=1341146&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/vm.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/vm.php Mon May 21 19:00:34 2012
@@ -936,7 +936,6 @@ function AJnewProfile() {
$newprofile = stripslashes($newprofile);
$newprofile = mysql_real_escape_string($newprofile);
}
- # TODO add check for existing name
$query = "SELECT id FROM vmprofile WHERE profilename = '$newprofile'";
$qh = doQuery($query, 101);
if($row = mysql_fetch_assoc($qh)) {
Modified: incubator/vcl/trunk/web/js/vm.js
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/vm.js?rev=1341146&r1=1341145&r2=1341146&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/vm.js (original)
+++ incubator/vcl/trunk/web/js/vm.js Mon May 21 19:00:34 2012
@@ -647,6 +647,7 @@ function newProfile(cont) {
function newProfileCB(data, ioArgs) {
if(data.items.failed) {
+ document.body.style.cursor = 'default';
dojo.byId('nperrormsg').innerHTML =
'A profile with this name already exists';
return;
