svn commit: r1338768 - /incubator/vcl/trunk/web/.ht-inc/computers.php

[jfthomps]

Author: jfthomps
Date: Tue May 15 16:04:52 2012
New Revision: 1338768

URL: http://svn.apache.org/viewvc?rev=1338768&view=rev
Log:
VCL-311
add more fields to edit computer page

computers.php:
-modified editOrAddComputer - fixed a few small issues with how the options you 
are allowed to select are controlled so that it works correctly when adding 
computers
-modified bulkAddComputer - added startstate and provval javascript values

Modified:
    incubator/vcl/trunk/web/.ht-inc/computers.php

Modified: incubator/vcl/trunk/web/.ht-inc/computers.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/computers.php?rev=1338768&r1=1338767&r2=1338768&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/computers.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/computers.php Tue May 15 16:04:52 2012
@@ -603,14 +603,16 @@ function editOrAddComputer($state) {
                        $tovmhostinuse = $row['start'];
        }
        print "<script type=\"text/javascript\">\n";
-       print "var startstate = '{$computers[$data['compid']]['state']}';\n";
+       if($state)
+               print "var startstate = 'maintenance';\n";
+       else
+               print "var startstate = 
'{$computers[$data['compid']]['state']}';\n";
        $tmp = array();
        foreach($states as $id => $val)
                $tmp[] = "{value: '$id', label: '$val'}";
        print "var allowedstates = [";
        print implode(',', $tmp);
        print "];\n";
-       print "var provval = {$data['provisioningid']};\n";
        $data2['states'] = $states;
        $platforms = getPlatforms();
        $tmp = getUserResources(array("scheduleAdmin"), array("manageGroup"));
@@ -642,6 +644,10 @@ function editOrAddComputer($state) {
        $allowedprovisioning['lab']['length'] = 
count($allowedprovisioning['lab']);
        $allowedprovisioning['blade']['length'] = 
count($allowedprovisioning['blade']);
        $allowedprovisioning['virtualmachine']['length'] = 
count($allowedprovisioning['virtualmachine']);
+       if($state)
+               print "var provval = 
{$allowedprovisioning['blade'][0]['id']};\n";
+       else
+               print "var provval = {$data['provisioningid']};\n";
        print "var allowedprovs = " . json_encode($allowedprovisioning) . ";\n";
        print "</script>\n";
 
@@ -1727,6 +1733,7 @@ function bulkAddComputer() {
        print "var allowedstates = [";
        print implode(',', $tmp);
        print "];\n";
+       print "var startstate = 'maintenance';\n";
        $platforms = getPlatforms();
        $tmp = getUserResources(array("scheduleAdmin"), array("manageGroup"));
        $schedules = $tmp["schedule"];
@@ -1753,6 +1760,7 @@ function bulkAddComputer() {
                                $showprovisioning[$id] = $val['prettyname'];
                }
        }
+       print "var provval = {$allowedprovisioning['blade'][0]['id']};\n";
        $allowedprovisioning['lab']['length'] = 
count($allowedprovisioning['lab']);
        $allowedprovisioning['blade']['length'] = 
count($allowedprovisioning['blade']);
        $allowedprovisioning['virtualmachine']['length'] = 
count($allowedprovisioning['virtualmachine']);