Commit c112aeb4 authored by Mike Hibler's avatar Mike Hibler
Browse files

Minor nits. The most important: when selecting eligible node types from the

DB, only select those for which a node of role 'testnode' exist.  This will
eliminate the pc1500, where we only have a couple of tipservers of that type.
parent 62dc6112
...@@ -48,7 +48,7 @@ $types_result = ...@@ -48,7 +48,7 @@ $types_result =
DBQueryFatal("select distinct n.type from nodes as n ". DBQueryFatal("select distinct n.type from nodes as n ".
"left join node_type_attributes as a on a.type=n.type ". "left join node_type_attributes as a on a.type=n.type ".
"where a.attrkey='imageable' and ". "where a.attrkey='imageable' and ".
" a.attrvalue!='0'"); " a.attrvalue!='0' and n.role='testnode'");
# #
# Spit the form out using the array of data. # Spit the form out using the array of data.
...@@ -481,7 +481,7 @@ if (!isset($submit)) { ...@@ -481,7 +481,7 @@ if (!isset($submit)) {
# #
# For users that are in one project and one subgroup, it is usually # For users that are in one project and one subgroup, it is usually
# the case that they should use the subgroup, and since they also tend # the case that they should use the subgroup, and since they also tend
# to be in the clueless portion of our users, give them some help. # to be in the naive portion of our users, give them some help.
# #
if (count($projlist) == 1) { if (count($projlist) == 1) {
list($project, $grouplist) = each($projlist); list($project, $grouplist) = each($projlist);
...@@ -596,7 +596,7 @@ elseif ($formfields["loadpart"] != 0 && $formfields["loadlength"] != 1) { ...@@ -596,7 +596,7 @@ elseif ($formfields["loadpart"] != 0 && $formfields["loadlength"] != 1) {
# Store the ones we care about and silently forget about the extraneous # Store the ones we care about and silently forget about the extraneous
# OSIDs by setting the locals to NULL. # OSIDs by setting the locals to NULL.
# #
# XXX This loops creates locals part1_osid, part2_osid, part3_osid, and # XXX This loop creates locals part1_osid, part2_osid, part3_osid, and
# part4_osid on the fly. Look at $$foo. We use them below. # part4_osid on the fly. Look at $$foo. We use them below.
# #
$osid_array = array(); $osid_array = array();
...@@ -649,7 +649,7 @@ elseif (! TBvalid_osid($formfields["default_osid"])) { ...@@ -649,7 +649,7 @@ elseif (! TBvalid_osid($formfields["default_osid"])) {
$errors["Boot OS"] = "Invalid characters in OSID"; $errors["Boot OS"] = "Invalid characters in OSID";
} }
elseif (!OSinfo::Lookup($formfields["default_osid"])) { elseif (!OSinfo::Lookup($formfields["default_osid"])) {
$errors["Boot OS"] = "No such OS defined"; $errors["Boot OS"] = "No such OS defined";
} }
else { else {
for ($i = 0; $i < count($osid_array); $i++) { for ($i = 0; $i < count($osid_array); $i++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment