[Midnightbsd-cvs] mports: index.cgi: varius cleanups and additions.

[ctriv at midnightbsd.org]

Log Message:
-----------
varius cleanups and additions.

Modified Files:
--------------
    mports/Tools/magus/www/data/magus:
        index.cgi (r1.7 -> r1.8)

-------------- next part --------------
Index: index.cgi
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/index.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Tools/magus/www/data/magus/index.cgi -L Tools/magus/www/data/magus/index.cgi -u -r1.7 -r1.8
--- Tools/magus/www/data/magus/index.cgi
+++ Tools/magus/www/data/magus/index.cgi
@@ -78,15 +78,24 @@
   );
   
   my @locks = map {{
-    port      => $_->port->name,
-    port_id   => $_->port->id,
-    machine   => $_->machine->name,
-    arch      => $_->port->run->arch,
-    run       => $_->port->run->id,
-    osversion => $_->port->run->osversion,
+    port       => $_->port->name,
+    port_id    => $_->port->id,
+    machine    => $_->machine->name,
+    machine_id => $_->machine->id,
+    arch       => $_->port->run->arch,
+    run        => $_->port->run->id,
+    osversion  => $_->port->run->osversion,
   }} Magus::Lock->retrieve_all;
+
+  my @runs = map {{
+    run       => $_->id,
+    arch      => $_->arch,
+    osversion => $_->osversion,
+    created   => $_->created,
+  }} Magus::Run->search(status => 'active');
   
   $tmpl->param(
+    runs  => \@runs,
     locks => \@locks
   ); 
   print $tmpl->output;
@@ -107,6 +116,8 @@
   $sth->execute($run->id);
   my $status_stats = $sth->fetchall_arrayref({});
   $sth->finish;
+
+  push(@$status_stats, { status => 'ready', count => Magus::Port->search_ready_ports($run)->count });
   
   $tmpl->param(status_stats => $status_stats);
   
@@ -179,6 +190,13 @@
   my $status = $p->param('status');
   
   my %details = (run => $run, status => $status);
+  my @ports;
+  
+  if ($status eq 'ready') {
+    @ports = Magus::Port->search_ready_ports($run);
+  } else {
+    @ports = Magus::Port->search(run => $run, status => $status);
+  }
   
   my @results = map {{
     summary   => $_->status,
@@ -188,7 +206,7 @@
     id        => $_->id,
     run       => $_->run,
     osversion => $_->run->osversion,
-  }} Magus::Port->search(run => $run, status => $status);
+  }} @ports;
                                   
   my $tmpl = template($p, 'result-list.tmpl');
   $tmpl->param(results => \@results);