All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 530230a6 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor tweak to printing out the derived from image.

parent 4fb2fb71
...@@ -833,6 +833,9 @@ class Image ...@@ -833,6 +833,9 @@ class Image
$p_imageid = $this->parent_imageid(); $p_imageid = $this->parent_imageid();
$p_version = $this->parent_version(); $p_version = $this->parent_version();
$p_image = Image::Lookup($p_imageid, $p_version); $p_image = Image::Lookup($p_imageid, $p_version);
# On an elabinelab we will not have the previous version.
# if it came in at creation time.
if ($p_image) {
$p_imagename = $p_image->imagename(); $p_imagename = $p_image->imagename();
$p_url = CreateURL("showimageid", $p_image, $p_url = CreateURL("showimageid", $p_image,
"version", $p_version); "version", $p_version);
...@@ -843,6 +846,7 @@ class Image ...@@ -843,6 +846,7 @@ class Image
${p_imagename}:${p_version}</a></td> ${p_imagename}:${p_version}</a></td>
</tr>\n"; </tr>\n";
} }
}
if ($this->version() > 0 && if ($this->version() > 0 &&
(is_null($this->parent_imageid()) || (is_null($this->parent_imageid()) ||
($this->parent_imageid() && ($this->parent_imageid() &&
......
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