Commit e96dbc26 authored by Leigh Stoller's avatar Leigh Stoller

Fix a couple of UI bugs.

parent 86f6218e
...@@ -47,7 +47,7 @@ SPITHEADER(1); ...@@ -47,7 +47,7 @@ SPITHEADER(1);
# The apt_aggregates table should tell us what clusters, but for # The apt_aggregates table should tell us what clusters, but for
# now it is always the local cluster # now it is always the local cluster
# #
if ($TBMAINSITE) { if ($TBMAINSITE && !$ISEMULAB) {
$aggregates = $aggregates =
array("Emulab" => "urn:publicid:IDN+emulab.net+authority+cm", array("Emulab" => "urn:publicid:IDN+emulab.net+authority+cm",
"APT" => "urn:publicid:IDN+apt.emulab.net+authority+cm", "APT" => "urn:publicid:IDN+apt.emulab.net+authority+cm",
...@@ -57,7 +57,8 @@ if ($TBMAINSITE) { ...@@ -57,7 +57,8 @@ if ($TBMAINSITE) {
"OneLab" => "urn:publicid:IDN+lab.onelab.eu+authority+cm"); "OneLab" => "urn:publicid:IDN+lab.onelab.eu+authority+cm");
} }
else { else {
$aggregates = array_keys($urn_mapping); $aggregate = Aggregate::Lookup($DEFAULT_AGGREGATE_URN);
$aggregates = array($aggregate->nickname() => $aggregate->urn());
} }
echo "<link rel='stylesheet' echo "<link rel='stylesheet'
href='css/tablesorter.css'>\n"; href='css/tablesorter.css'>\n";
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</thead> </thead>
<tbody> <tbody>
<% prereslist.forEach(function(value, index) { %> <% prereslist.forEach(function(value, index) { %>
<% var expando_target = cluster_name + "-" + value.pid + "-collapse"; %> <% var expando_target = cluster_name + "-" + value.pid + "-" + value.name + "-collapse"; %>
<tr> <tr>
<td> <td>
<% if (value.prereserved.length) { %> <% if (value.prereserved.length) { %>
......
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