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 854cfae2 authored by Leigh B Stoller's avatar Leigh B Stoller

Show the cluster name in the node popover on the topology tab.

parent 78be7b03
......@@ -1040,6 +1040,8 @@ $(function ()
return;
}
$.each(statusblob , function(urn, iblob) {
var cluster_id = amlist[urn].nickname;
// Will not have node details until manifest is ready.
if (!_.has(iblob, "details")) {
if (iblob.status == "deferred") {
......@@ -1129,6 +1131,8 @@ $(function ()
details.component_urn + "</td></tr>" +
"<tr><td class='border-none'>ID:</td><td class='border-none'>" +
details.client_id + "</td></tr>" +
"<tr><td class='border-none'>Cluster:</td><td class='border-none'>" +
cluster_id + "</td></tr>" +
"<tr><td class='border-none'>Status:</td><td class='border-none'>" +
(recovery ? "<b>recovery</b>" : details.status) +
"</td></tr>" +
......
......@@ -315,6 +315,7 @@ foreach ($slivers as $sliver) {
$blob[$aggregate_urn] = array("weburl" => $weburl,
"name" => $aggregate->name(),
"nickname" => $aggregate->nickname(),
"abbreviation" => $aggregate->abbreviation());
}
echo "<script type='text/plain' id='amlist-json'>\n";
......
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