From 0f1c580731a4113788b984ee827435d02b743c80 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 21 Oct 2010 14:37:03 +0000 Subject: [PATCH] hydra: order machines by enabled/disabled, add green and red color for enabled/disabled --- src/lib/Hydra/Controller/Admin.pm | 2 +- src/root/admin.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Hydra/Controller/Admin.pm b/src/lib/Hydra/Controller/Admin.pm index d0dc5e4d..3a6d3fd0 100644 --- a/src/lib/Hydra/Controller/Admin.pm +++ b/src/lib/Hydra/Controller/Admin.pm @@ -45,7 +45,7 @@ sub index : Chained('admin') PathPart('') Args(0) { my ($self, $c) = @_; $c->stash->{machines} = [$c->model('DB::BuildMachines')->search( {}, - { order_by => "hostname" + { order_by => ["enabled DESC", "hostname"] , '+select' => ["(select bs.stoptime from buildsteps as bs where bs.machine = (me.username || '\@' || me.hostname) and not bs.stoptime is null order by bs.stoptime desc limit 1)"] , '+as' => ['idle'] })]; diff --git a/src/root/admin.tt b/src/root/admin.tt index 71a1b4df..491341d2 100644 --- a/src/root/admin.tt +++ b/src/root/admin.tt @@ -20,7 +20,7 @@ -
+ [% IF m.enabled == 1 %] [% INCLUDE maybeLink uri = c.uri_for('/admin/machine' m.hostname 'disable' ) content='-' %] [% ELSE %]