From 107a0faa51beb9c12e49ef556b952eea61b1fa88 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Mar 2009 15:57:43 +0000 Subject: [PATCH] * PROCESS -> INCLUDE in most cases. INCLUDE does proper scoping of variables. --- src/root/all.tt | 2 +- src/root/build.tt | 22 +++++++++++----------- src/root/common.tt | 6 +++--- src/root/index.tt | 2 +- src/root/jobstatus.tt | 2 +- src/root/layout.tt | 2 +- src/root/project.tt | 4 ++-- src/root/queue.tt | 2 +- src/root/releases.tt | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/root/all.tt b/src/root/all.tt index 65979cc7..931686c7 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -9,7 +9,7 @@

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

-[% PROCESS renderBuildList %] +[% INCLUDE renderBuildList %] [First] [% IF page > 1 %] diff --git a/src/root/build.tt b/src/root/build.tt index 38ab2fba..a9628703 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -64,7 +64,7 @@ [% END %] [% ELSIF build.schedulingInfo.busy %] Build in progress - since [% PROCESS renderDateTime timestamp = build.schedulingInfo.starttime %] + since [% INCLUDE renderDateTime timestamp = build.schedulingInfo.starttime %] [% ELSE %] Scheduled to be built [% IF c.user_exists %] @@ -77,15 +77,15 @@ Project: - [% PROCESS renderProjectName %] + [% INCLUDE renderProjectName %] Jobset: - [% PROCESS renderJobsetName %] + [% INCLUDE renderJobsetName %] Job name: - [% PROCESS renderJobName %] + [% INCLUDE renderJobName %] Nix name: @@ -137,16 +137,16 @@ Time added: - [% PROCESS renderDateTime timestamp = build.timestamp %] + [% INCLUDE renderDateTime timestamp = build.timestamp %] [% IF build.finished && build.resultInfo.buildstatus != 4 %] Build started: - [% IF build.resultInfo.starttime %][% PROCESS renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %](cached build)[% END %] + [% IF build.resultInfo.starttime %][% INCLUDE renderDateTime timestamp = build.resultInfo.starttime %][% ELSE %](cached build)[% END %] Build finished: - [% IF build.resultInfo.stoptime %][% PROCESS renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %](cached build)[% END %] + [% IF build.resultInfo.stoptime %][% INCLUDE renderDateTime timestamp = build.resultInfo.stoptime %][% ELSE %](cached build)[% END %] Duration: @@ -189,7 +189,7 @@ [% type = input.type; inputTypes.$type %] [% IF input.type == "build" %] - Job [% PROCESS renderFullJobNameOfBuild build=input.dependency %] build [% input.dependency.id %] + Job [% INCLUDE renderFullJobNameOfBuild build=input.dependency %] build [% input.dependency.id %] [% ELSIF input.type == "string" || input.type == "boolean" %] "[% input.value %]" [% ELSE %] @@ -282,7 +282,7 @@

Note: this build is no longer available.

[% END %] -[% PROCESS renderProductList %] +[% INCLUDE renderProductList %] [% END %] @@ -300,10 +300,10 @@ [% FOREACH input IN build.dependents -%] - Job [% PROCESS renderFullJobNameOfBuild build=input.build %] build [% input.build.id %] + Job [% INCLUDE renderFullJobNameOfBuild build=input.build %] build [% input.build.id %] [% input.name %] [% input.build.system %] - [% PROCESS renderDateTime timestamp = input.build.timestamp %] + [% INCLUDE renderDateTime timestamp = input.build.timestamp %] [% END -%] diff --git a/src/root/common.tt b/src/root/common.tt index 1232ead4..74535dfa 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -32,14 +32,14 @@ [% BLOCK renderFullJobName %] - [% PROCESS renderProjectName %]:[% PROCESS renderJobsetName %]:[% PROCESS renderJobName %] + [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %] [% END %] [% BLOCK renderFullJobNameOfBuild %] - [% PROCESS renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %] + [% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %] [% END %] @@ -86,7 +86,7 @@ [% build.schedulingInfo.priority %] [% END %] - [% PROCESS renderFullJobNameOfBuild %] + [% INCLUDE renderFullJobNameOfBuild %] [% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %] [% build.system %] diff --git a/src/root/index.tt b/src/root/index.tt index 44ff308e..c2b2f4a6 100644 --- a/src/root/index.tt +++ b/src/root/index.tt @@ -7,7 +7,7 @@

Statistics

-[% PROCESS showBuildStats %] +[% INCLUDE showBuildStats %] [% END %] diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt index bf2f773a..b6a6c060 100644 --- a/src/root/jobstatus.tt +++ b/src/root/jobstatus.tt @@ -5,6 +5,6 @@

Below are the latest builds for each job.

-[% PROCESS renderBuildList builds=latestBuilds %] +[% INCLUDE renderBuildList builds=latestBuilds %] [% END %] diff --git a/src/root/layout.tt b/src/root/layout.tt index c9240055..7509a29d 100644 --- a/src/root/layout.tt +++ b/src/root/layout.tt @@ -146,7 +146,7 @@ [% content %]