* Refactoring.
This commit is contained in:
@ -10,16 +10,10 @@ use Hydra::Helper::CatalystUtils;
|
||||
sub job : Chained('/') PathPart('job') CaptureArgs(3) {
|
||||
my ($self, $c, $projectName, $jobsetName, $jobName) = @_;
|
||||
|
||||
# !!! cut&paste from Project::project.
|
||||
my $project = $c->model('DB::Projects')->find($projectName)
|
||||
or notFound($c, "Project $projectName doesn't exist.");
|
||||
|
||||
$c->stash->{curProject} = $project;
|
||||
|
||||
$c->stash->{jobset} = $project->jobsets->find({name => $jobsetName})
|
||||
or notFound($c, "Jobset $jobsetName doesn't exist.");
|
||||
|
||||
$c->stash->{jobName} = $jobName;
|
||||
$c->stash->{job} = $c->model('DB::Jobs')->find({project => $projectName, jobset => $jobsetName, name => $jobName})
|
||||
or notFound($c, "Job $projectName:$jobsetName:$jobName doesn't exist.");
|
||||
$c->stash->{project} = $c->stash->{job}->project;
|
||||
$c->stash->{jobset} = $c->stash->{job}->jobset;
|
||||
}
|
||||
|
||||
|
||||
@ -32,10 +26,9 @@ sub index : Chained('job') PathPart('') Args(0) {
|
||||
# Hydra::Base::Controller::ListBuilds needs this.
|
||||
sub get_builds : Chained('job') PathPart('') CaptureArgs(0) {
|
||||
my ($self, $c) = @_;
|
||||
$c->stash->{allBuilds} =
|
||||
$c->stash->{jobset}->builds->search({job => $c->stash->{jobName}});
|
||||
$c->stash->{allBuilds} = $c->stash->{job}->builds;
|
||||
$c->stash->{channelBaseName} =
|
||||
$c->stash->{curProject}->name . "-" . $c->stash->{jobset}->name . "-" . $c->stash->{jobName};
|
||||
$c->stash->{project}->name . "-" . $c->stash->{jobset}->name . "-" . $c->stash->{job}->name;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user