snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Allow non-admin users to see the machine status page

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-20 16:40:09 +01:00
parent 656b1bd45a
commit 7da2398f27
6 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/lib/Hydra/Controller/Admin.pm
View file

@ -52,23 +52,6 @@ sub admin : Chained('/') PathPart('admin') CaptureArgs(0) {
}
sub index : Chained('admin') PathPart('') Args(0) {
my ($self, $c) = @_;
$c->stash->{machines} = [$c->model('DB::BuildMachines')->search(
{},
{ 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']
})];
$c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
{ finished => 0, 'me.busy' => 1, 'build.busy' => 1, },
{ join => [ 'build' ]
, order_by => [ 'machine', 'stepnr' ]
} ) ];
$c->stash->{template} = 'admin.tt';
}
sub updateUser {
my ($c, $user) = @_;
@ -119,8 +102,6 @@ sub create_user_submit : Chained('admin') PathPart('create-user/submit') Args(0)
}
sub user : Chained('admin') PathPart('user') CaptureArgs(1) {
my ($self, $c, $username) = @_;

17
src/lib/Hydra/Controller/Root.pm
View file

@ -102,6 +102,23 @@ sub status :Local {
}
sub machines :Local Args(0) {
my ($self, $c) = @_;
$c->stash->{machines} = [$c->model('DB::BuildMachines')->search(
{},
{ 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']
})];
$c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
{ finished => 0, 'me.busy' => 1, 'build.busy' => 1, },
{ join => [ 'build' ]
, order_by => [ 'machine', 'stepnr' ]
} ) ];
$c->stash->{template} = 'machine-status.tt';
}
# Hydra::Base::Controller::ListBuilds needs this.
sub get_builds : Chained('/') PathPart('') CaptureArgs(0) {
my ($self, $c) = @_;

2
src/root/all.tt
View file

@ -1,4 +1,4 @@
[% WRAPPER layout.tt title="All builds" _
[% WRAPPER layout.tt title="Recent builds" _
(job ? " for job $project.name:$jobset.name:$job.name" :
jobset ? " for jobset $project.name:$jobset.name" :
project ? " for project $project.name" : "") %]

0
src/root/admin.tt → src/root/machine-status.tt
View file

8
src/root/machines.tt
View file

@ -36,12 +36,4 @@
<p><a class="btn" href="[% c.uri_for(c.controller('Admin').action_for('create_machine')) %]"><i class="icon-plus"></i> Add a new machine</a></p>
<p>
Resulting <tt>/etc/nix.machines</tt> [% IF nixMachinesWritable == 0 %](note: file is not writable!)[% END%]:
</p>
<pre>
[% nixMachines %]
</pre>
[% END %]

4
src/root/topbar.tt
View file

@ -31,10 +31,10 @@
uri = c.uri_for(c.controller('Root').action_for('queue'))
title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
[% INCLUDE makeLink
uri = c.uri_for(c.controller(Root).action_for('status'))
uri = c.uri_for(c.controller('Root').action_for('status'))
title = "Active build steps" %]
[% INCLUDE makeLink
uri = c.uri_for(c.controller('Admin').action_for('index'))
uri = c.uri_for(c.controller('Root').action_for('machines'))
title = "Machine status" %]
[% INCLUDE makeLink
uri = c.uri_for(c.controller('Root').action_for('all'))