From 522bcea8fc03419a73f8c5a11e8a94859e76b694 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Feb 2015 13:28:14 +0100 Subject: [PATCH] Hide build IDs from build lists Like eval IDs, build IDs don't convey useful information. Also, make the job name link to the build rather than the job. When people click on a build, they expect to go to the build page, not the job page. --- src/root/common.tt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/root/common.tt b/src/root/common.tt index b27ec992..ff5d481e 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -77,13 +77,12 @@ BLOCK renderBuildListHeader %] [% IF showSchedulingInfo %] [% END %] - # [% IF !hideJobName %] Job [% END %] - Release name - System [% IF showSchedulingInfo %]Queued at[% ELSE %]Finished at[% END %] + Package/release name + System [% IF showDescription %] Description [% END %] @@ -94,7 +93,7 @@ BLOCK renderBuildListHeader %] BLOCK renderBuildListBody; - FOREACH build IN builds; %] + FOREACH build IN builds; link = c.uri_for('/build' build.id) %] [% IF !hideResultInfo %] @@ -104,13 +103,12 @@ BLOCK renderBuildListBody; [% IF showSchedulingInfo %] [% IF build.busy %]Started[% ELSE %]Queued[% END %] [% END %] - [% build.id %] [% IF !hideJobName %] - [% INCLUDE renderFullJobNameOfBuild %] + [%build.get_column("project")%]:[%build.get_column("jobset")%]:[%build.get_column("job")%] [% END %] + [% t = showSchedulingInfo ? build.timestamp : build.stoptime; IF t; INCLUDE renderRelativeDate timestamp=(showSchedulingInfo ? build.timestamp : build.stoptime); ELSE; "-"; END %] [% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %] [% build.system %] - [% t = showSchedulingInfo ? build.timestamp : build.stoptime; IF t; date.format(showSchedulingInfo ? build.timestamp : build.stoptime, '%Y-%m-%d %H:%M:%S'); ELSE; "-"; END %] [% IF showDescription %] [% build.description %] [% END %]