From 3c86b3652cdc5b91d262f5bc74dc70c9db4235cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Mar 2009 15:41:19 +0000 Subject: [PATCH] * Refactoring. --- src/lib/Hydra/Controller/Build.pm | 2 +- src/lib/Hydra/Controller/Job.pm | 19 ++++++------------- src/lib/Hydra/Controller/Jobset.pm | 4 ++-- src/lib/Hydra/Controller/Project.pm | 18 +++++++++--------- src/lib/Hydra/Controller/Root.pm | 6 +++--- src/root/all.tt | 6 +++--- src/root/edit-releaseset.tt | 8 ++++---- src/root/jobstatus.tt | 2 +- src/root/layout.tt | 10 ++++------ src/root/project.tt | 28 ++++++++++++++-------------- src/root/releases.tt | 4 ++-- src/root/releasesets.tt | 10 +++++----- 12 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm index 3c1c15fb..68496a7c 100644 --- a/src/lib/Hydra/Controller/Build.pm +++ b/src/lib/Hydra/Controller/Build.pm @@ -17,7 +17,7 @@ sub build : Chained('/') PathPart CaptureArgs(1) { notFound($c, "Build with ID $id doesn't exist.") if !defined $c->stash->{build}; - $c->stash->{curProject} = $c->stash->{build}->project; + $c->stash->{project} = $c->stash->{build}->project; } diff --git a/src/lib/Hydra/Controller/Job.pm b/src/lib/Hydra/Controller/Job.pm index 1caf1757..a3be5c2f 100644 --- a/src/lib/Hydra/Controller/Job.pm +++ b/src/lib/Hydra/Controller/Job.pm @@ -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; } diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm index d694c332..8e21ae63 100644 --- a/src/lib/Hydra/Controller/Jobset.pm +++ b/src/lib/Hydra/Controller/Jobset.pm @@ -13,7 +13,7 @@ sub jobset : Chained('/') PathPart('jobset') CaptureArgs(2) { my $project = $c->model('DB::Projects')->find($projectName) or notFound($c, "Project $projectName doesn't exist."); - $c->stash->{curProject} = $project; + $c->stash->{project} = $project; $c->stash->{jobset} = $project->jobsets->find({name => $jobsetName}) or notFound($c, "Jobset $jobsetName doesn't exist."); @@ -32,7 +32,7 @@ sub get_builds : Chained('jobset') PathPart('') CaptureArgs(0) { $c->stash->{allBuilds} = $c->stash->{jobset}->builds; $c->stash->{channelBaseName} = - $c->stash->{curProject}->name . "-" . $c->stash->{jobset}->name; + $c->stash->{project}->name . "-" . $c->stash->{jobset}->name; } diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm index d03020c2..461d2c18 100644 --- a/src/lib/Hydra/Controller/Project.pm +++ b/src/lib/Hydra/Controller/Project.pm @@ -13,7 +13,7 @@ sub project : Chained('/') PathPart('project') CaptureArgs(1) { my $project = $c->model('DB::Projects')->find($projectName) or notFound($c, "Project $projectName doesn't exist."); - $c->stash->{curProject} = $project; + $c->stash->{project} = $project; } @@ -22,14 +22,14 @@ sub view : Chained('project') PathPart('') Args(0) { $c->stash->{template} = 'project.tt'; - getBuildStats($c, scalar $c->stash->{curProject}->builds); + getBuildStats($c, scalar $c->stash->{project}->builds); } sub edit : Chained('project') PathPart Args(0) { my ($self, $c) = @_; - requireProjectOwner($c, $c->stash->{curProject}); + requireProjectOwner($c, $c->stash->{project}); $c->stash->{template} = 'project.tt'; $c->stash->{edit} = 1; @@ -39,12 +39,12 @@ sub edit : Chained('project') PathPart Args(0) { sub submit : Chained('project') PathPart Args(0) { my ($self, $c) = @_; - requireProjectOwner($c, $c->stash->{curProject}); + requireProjectOwner($c, $c->stash->{project}); error($c, "Request must be POSTed.") if $c->request->method ne "POST"; $c->model('DB')->schema->txn_do(sub { - updateProject($c, $c->stash->{curProject}); + updateProject($c, $c->stash->{project}); }); $c->res->redirect($c->uri_for($self->action_for("view"), $c->req->captures)); @@ -54,12 +54,12 @@ sub submit : Chained('project') PathPart Args(0) { sub delete : Chained('project') PathPart Args(0) { my ($self, $c) = @_; - requireProjectOwner($c, $c->stash->{curProject}); + requireProjectOwner($c, $c->stash->{project}); error($c, "Request must be POSTed.") if $c->request->method ne "POST"; $c->model('DB')->schema->txn_do(sub { - $c->stash->{curProject}->delete; + $c->stash->{project}->delete; }); $c->res->redirect($c->uri_for("/")); @@ -224,8 +224,8 @@ sub updateProject { # Hydra::Base::Controller::ListBuilds needs this. sub get_builds : Chained('project') PathPart('') CaptureArgs(0) { my ($self, $c) = @_; - $c->stash->{allBuilds} = $c->stash->{curProject}->builds; - $c->stash->{channelBaseName} = $c->stash->{curProject}->name; + $c->stash->{allBuilds} = $c->stash->{project}->builds; + $c->stash->{channelBaseName} = $c->stash->{project}->name; } diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm index 1c97212c..00ba6562 100644 --- a/src/lib/Hydra/Controller/Root.pm +++ b/src/lib/Hydra/Controller/Root.pm @@ -68,7 +68,7 @@ sub releasesets :Local { my $project = $c->model('DB::Projects')->find($projectName); notFound($c, "Project $projectName doesn't exist.") if !defined $project; - $c->stash->{curProject} = $project; + $c->stash->{project} = $project; $c->stash->{releaseSets} = [$project->releasesets->all]; } @@ -79,7 +79,7 @@ sub getReleaseSet { my $project = $c->model('DB::Projects')->find($projectName); die "Project $projectName doesn't exist." if !defined $project; - $c->stash->{curProject} = $project; + $c->stash->{project} = $project; (my $releaseSet) = $c->model('DB::ReleaseSets')->find($projectName, $releaseSetName); die "Release set $releaseSetName doesn't exist." if !defined $releaseSet; @@ -175,7 +175,7 @@ sub create_releaseset :Local { my $project = $c->model('DB::Projects')->find($projectName); die "Project $projectName doesn't exist." if !defined $project; - $c->stash->{curProject} = $project; + $c->stash->{project} = $project; requireProjectOwner($c, $project); diff --git a/src/root/all.tt b/src/root/all.tt index efc58cfe..65979cc7 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -2,9 +2,9 @@ [% PROCESS common.tt %]

All Builds - [% IF jobName %]for Job [% curProject.name %]:[% jobset.name %]:[% jobName %] - [% ELSIF jobset %]for Jobset [% curProject.name %]:[% jobset.name %] - [% ELSIF curProject %] for Project [% curProject.name %][% END %]

+ [% IF job %]for Job [% project.name %]:[% jobset.name %]:[% job.name %] + [% ELSIF jobset %]for Jobset [% project.name %]:[% jobset.name %] + [% ELSIF project %] for Project [% project.name %][% END %]

Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% totalBuilds %] in order of descending timestamp.

diff --git a/src/root/edit-releaseset.tt b/src/root/edit-releaseset.tt index 90ed6dfe..c2f68001 100644 --- a/src/root/edit-releaseset.tt +++ b/src/root/edit-releaseset.tt @@ -1,8 +1,8 @@ -[% WRAPPER layout.tt title=(create ? "New Release Set" : "Release Set ‘$curProject.name:$releaseSet.name’") %] +[% WRAPPER layout.tt title=(create ? "New Release Set" : "Release Set ‘$project.name:$releaseSet.name’") %] [% PROCESS common.tt %] [% USE HTML %] -

[% IF create %]New Release Set[% ELSE %]Release Set [% curProject.name %]:[% releaseSet.name %][% END %]

+

[% IF create %]New Release Set[% ELSE %]Release Set [% project.name %]:[% releaseSet.name %][% END %]

[% BLOCK renderJob %] @@ -21,7 +21,7 @@ [% END %] -
+ @@ -86,7 +86,7 @@ [% IF !create %] - +

diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt index 03152601..bf2f773a 100644 --- a/src/root/jobstatus.tt +++ b/src/root/jobstatus.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Job Status" %] [% PROCESS common.tt %] -

Job Status[% IF curProject %] of Project [% curProject.name %][% END %]

+

Job Status[% IF project %] of Project [% project.name %][% END %]

Below are the latest builds for each job.

diff --git a/src/root/layout.tt b/src/root/layout.tt index b5ed8689..c9240055 100644 --- a/src/root/layout.tt +++ b/src/root/layout.tt @@ -99,10 +99,10 @@
  • Projects
      - [% FOREACH project IN projects %] -
    • -
      [% HTML.escape(project.displayname) %]
      - [% IF curProject.name == project.name %] + [% FOREACH project_ IN projects %] +
    • +
      [% HTML.escape(project_.displayname) %]
      + [% IF project.name == project_.name %]
        [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'jobstatus') title = "Job status" %] [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %] @@ -120,8 +120,6 @@
      [% END %] [% END %] - - [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'edit') title = "Edit" %]
    [% END %] diff --git a/src/root/project.tt b/src/root/project.tt index 7bd076a3..ea8381c4 100644 --- a/src/root/project.tt +++ b/src/root/project.tt @@ -1,4 +1,4 @@ -[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing Project ‘$curProject.name’") : "Project ‘$curProject.name’") %] +[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing Project ‘$project.name’") : "Project ‘$project.name’") %] [% PROCESS common.tt %] [% USE HTML %] @@ -133,14 +133,14 @@ [% IF edit %] -
    + [% END %] [% IF create %]

    New Project

    [% ELSE %] -

    Project [% curProject.name %]

    +

    Project [% project.name %]

    [% END %] @@ -150,25 +150,25 @@ [% IF edit %]
    • - + [% END %] - + - + - +
    Identifier:[% INCLUDE maybeEditString param="name" value=curProject.name %][% INCLUDE maybeEditString param="name" value=project.name %]
    Display name:[% INCLUDE maybeEditString param="displayname" value=curProject.displayname %][% INCLUDE maybeEditString param="displayname" value=project.displayname %]
    Description:[% INCLUDE maybeEditString param="description" value=curProject.description %][% INCLUDE maybeEditString param="description" value=project.description %]
    Homepage: [% IF edit %] - [% INCLUDE maybeEditString param="homepage" value=curProject.homepage %] + [% INCLUDE maybeEditString param="homepage" value=project.homepage %] [% ELSE %] - [% IF curProject.homepage %] - curProject.homepage) %]>[% HTML.escape(curProject.homepage) %] + [% IF project.homepage %] + project.homepage) %]>[% HTML.escape(project.homepage) %] [% ELSE %] (not specified) [% END %] @@ -177,12 +177,12 @@
    Owner:[% INCLUDE maybeEditString param="owner" value=curProject.owner.username edit=(edit && c.check_user_roles('admin')) %][% INCLUDE maybeEditString param="owner" value=project.owner.username edit=(edit && c.check_user_roles('admin')) %]
    Enabled: - [% INCLUDE renderSelection param="enabled" curValue=curProject.enabled options={"1" = "Yes", "0" = "No"} %] + [% INCLUDE renderSelection param="enabled" curValue=project.enabled options={"1" = "Yes", "0" = "No"} %]
    @@ -199,7 +199,7 @@

    Jobsets

    -[% IF curProject.jobsets && curProject.jobsets.size > 0 || edit %] +[% IF project.jobsets && project.jobsets.size > 0 || edit %] [% IF edit %]

    @@ -250,7 +250,7 @@ [% END %] - [% FOREACH jobset IN curProject.jobsets -%] + [% FOREACH jobset IN project.jobsets -%] [% INCLUDE renderJobset jobset=jobset baseName=jobset.name %] [% END -%] @@ -271,7 +271,7 @@ [% IF !create %] - +

    diff --git a/src/root/releases.tt b/src/root/releases.tt index c0eeb62e..e13d8a17 100644 --- a/src/root/releases.tt +++ b/src/root/releases.tt @@ -5,8 +5,8 @@

    Release Set [% releaseSet.project.name %]:[% releaseSet.name %]

    -[Edit] -[Latest] +[Edit] +[Latest]

    diff --git a/src/root/releasesets.tt b/src/root/releasesets.tt index d025838b..d9a096a3 100644 --- a/src/root/releasesets.tt +++ b/src/root/releasesets.tt @@ -5,24 +5,24 @@ [% IF releaseSets.size > 0 %] -

    Project [% curProject.name %] has the following release sets:

    +

    Project [% project.name %] has the following release sets:

    [% ELSE %] -

    Project [% curProject.name %] has no release sets.

    +

    Project [% project.name %] has no release sets.

    [% END %] -

    [Create a new release set]

    +

    [Create a new release set]

    [% END %]