Commit c28cbcee authored by Leigh B Stoller's avatar Leigh B Stoller

Fix various bits of bitrot on the admin dashboard page.

parent 6fb6f884
<?php <?php
# #
# Copyright (c) 2000-2018 University of Utah and the Flux Group. # Copyright (c) 2000-2019 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -131,7 +131,7 @@ function Do_GetStats() ...@@ -131,7 +131,7 @@ function Do_GetStats()
"creator_idx" => $creator_idx, "creator_idx" => $creator_idx,
"creator" => $creator, "creator" => $creator,
"physnode_count" => $pcount, "physnode_count" => $pcount,
"created" => $created, "started" => $created,
"cluster" => $cluster, "cluster" => $cluster,
"profile_uuid" => $profile_uuid, "profile_uuid" => $profile_uuid,
"profile_name" => $profile_name); "profile_name" => $profile_name);
...@@ -190,6 +190,7 @@ function Do_GetStats() ...@@ -190,6 +190,7 @@ function Do_GetStats()
DBQueryFatal("select p.uuid,p.name,count(h.profile_id) as count ". DBQueryFatal("select p.uuid,p.name,count(h.profile_id) as count ".
" from apt_instance_history as h ". " from apt_instance_history as h ".
"left join apt_profiles as p on p.profileid=h.profile_id ". "left join apt_profiles as p on p.profileid=h.profile_id ".
"where p.uuid is not null ".
"group by profile_id order by count desc limit 10"); "group by profile_id order by count desc limit 10");
while ($row = mysql_fetch_array($query_result)) { while ($row = mysql_fetch_array($query_result)) {
$name = $row["name"]; $name = $row["name"];
...@@ -280,7 +281,7 @@ function Do_GetStats() ...@@ -280,7 +281,7 @@ function Do_GetStats()
"uuid" => $uuid, "uuid" => $uuid,
"exitcode" => $exitcode, "exitcode" => $exitcode,
"active" => $active, "active" => $active,
"created" => $created, "started" => $created,
"creator" => $creator, "creator" => $creator,
"reason" => $reason, "reason" => $reason,
"message" => $message, "message" => $message,
...@@ -318,7 +319,7 @@ function Do_GetStats() ...@@ -318,7 +319,7 @@ function Do_GetStats()
"uuid" => $uuid, "uuid" => $uuid,
"pid" => $pid, "pid" => $pid,
"creator" => $creator, "creator" => $creator,
"created" => $created, "started" => $created,
"expires" => $expires); "expires" => $expires);
} }
$dashboard["extension_requests"] = $extension_details; $dashboard["extension_requests"] = $extension_details;
...@@ -360,7 +361,7 @@ function Do_GetStats() ...@@ -360,7 +361,7 @@ function Do_GetStats()
"creator_idx" => $creator_idx, "creator_idx" => $creator_idx,
"creator" => $creator, "creator" => $creator,
"physnode_count" => $pcount, "physnode_count" => $pcount,
"created" => $created, "started" => $created,
"expires" => $expires, "expires" => $expires,
"cluster" => $cluster, "cluster" => $cluster,
"profile_uuid" => $profile_uuid, "profile_uuid" => $profile_uuid,
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<th>Profile</th> <th>Profile</th>
<th>Cluster</th> <th>Cluster</th>
<th>PCs</th> <th>PCs</th>
<th>Created</th> <th>Started</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<th>Name</th> <th>Name</th>
<th>Creator</th> <th>Creator</th>
<th>Project</th> <th>Project</th>
<th>Created</th> <th>Started</th>
<th>Expires</th> <th>Expires</th>
</tr> </tr>
</thead> </thead>
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
<th>Profile</th> <th>Profile</th>
<th>Cluster</th> <th>Cluster</th>
<th>PCs</th> <th>PCs</th>
<th>Created</th> <th>Started</th>
<th>Expires</th> <th>Expires</th>
</tr> </tr>
</thead> </thead>
......
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