Commit 72998025 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Add deprecation info to the image array.

parent 0bd0358e
...@@ -178,6 +178,7 @@ function Do_GetImageInfo() ...@@ -178,6 +178,7 @@ function Do_GetImageInfo()
foreach ($ajax_args["images"] as $urn) { foreach ($ajax_args["images"] as $urn) {
$types = array(); $types = array();
$virts = array(); $virts = array();
$deprecated = 0;
if (Instance::ValidURN($urn)) { if (Instance::ValidURN($urn)) {
# This // vs : thing is a pain. # This // vs : thing is a pain.
...@@ -339,6 +340,14 @@ function Do_GetImageInfo() ...@@ -339,6 +340,14 @@ function Do_GetImageInfo()
} }
$virts[$row["virtualizaton"]] = $row["virtualizaton"]; $virts[$row["virtualizaton"]] = $row["virtualizaton"];
$description = $row["description"]; $description = $row["description"];
#
# I suppose an alias can point to a deprecated image.
#
if ($row["deprecated"]) {
$deprecated = $row["deprecated"];
$deprecated_iserror = $row["deprecated_iserror"];
$deprecated_message = $row["deprecated_message"];
}
} }
if (count($types)) { if (count($types)) {
if (isset($types["pcvm"])) { if (isset($types["pcvm"])) {
...@@ -357,8 +366,17 @@ function Do_GetImageInfo() ...@@ -357,8 +366,17 @@ function Do_GetImageInfo()
array("images" => array($urn), array("images" => array($urn),
"hardware" => array($typelist))); "hardware" => array($typelist)));
$images[] = array("id" => $urn, $im = array("id" => $urn,
"name" => $description); "name" => $description,
"deprecated" => false);
if ($deprecated) {
$im["deprecated"] = $deprecated;
$im["deprecated_iserror"] = ($deprecated_iserror ? true:false);
$im["deprecated_message"] = $deprecated_message;
}
else {
}
$images[] = $im;
} }
} }
$result = array(array("constraints" => $constraints, $result = array(array("constraints" => $constraints,
......
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