Commit bad6c48d authored by Mike Hibler's avatar Mike Hibler

Ick! Present a list of non-disk based OSIDs for adminmfs_osid and

diskloadmfs_osid editing.
parent f720d1d6
...@@ -89,7 +89,7 @@ $initial_attributes = array( ...@@ -89,7 +89,7 @@ $initial_attributes = array(
# #
function SPITFORM($node_type, $formfields, $attributes, $deletes, $errors) function SPITFORM($node_type, $formfields, $attributes, $deletes, $errors)
{ {
global $osid_result, $imageid_result, $new_type; global $osid_result, $imageid_result, $mfsosid_result, $new_type;
global $newattribute_name, $newattribute_value, $newattribute_type; global $newattribute_name, $newattribute_value, $newattribute_type;
# #
...@@ -254,6 +254,11 @@ function SPITFORM($node_type, $formfields, $attributes, $deletes, $errors) ...@@ -254,6 +254,11 @@ function SPITFORM($node_type, $formfields, $attributes, $deletes, $errors)
WRITEOSIDMENU($key, "attributes[$key]", $osid_result, $val, WRITEOSIDMENU($key, "attributes[$key]", $osid_result, $val,
"deletes[$key]", $deletes[$key]); "deletes[$key]", $deletes[$key]);
} }
elseif ($key == "adminmfs_osid" ||
$key == "diskloadmfs_osid") {
WRITEOSIDMENU($key, "attributes[$key]", $mfsosid_result, $val,
"deletes[$key]", $deletes[$key]);
}
elseif ($key == "default_imageid") { elseif ($key == "default_imageid") {
WRITEIMAGEIDMENU($key, "attributes[$key]", $imageid_result, $val, WRITEIMAGEIDMENU($key, "attributes[$key]", $imageid_result, $val,
"deletes[$key]", $deletes[$key]); "deletes[$key]", $deletes[$key]);
...@@ -386,6 +391,11 @@ $osid_result = ...@@ -386,6 +391,11 @@ $osid_result =
"where (path='' or path is NULL) ". "where (path='' or path is NULL) ".
"order by pid,osname"); "order by pid,osname");
$mfsosid_result =
DBQueryFatal("select osid,osname,pid from os_info ".
"where (path is not NULL and path!='') ".
"order by pid,osname");
$imageid_result = $imageid_result =
DBQueryFatal("select imageid,imagename,pid from images ". DBQueryFatal("select imageid,imagename,pid from images ".
"order by pid,imagename"); "order by pid,imagename");
......
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