From 3e15900c5663cbcb498968268bf9edbb242fdff0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 20 Nov 2020 21:01:09 +0000 Subject: [PATCH] Fix build links on the derivation page In the case where the build is for a different derivation with the same outputs. --- guix-data-service/model/build.scm | 1 + guix-data-service/web/view/html.scm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/guix-data-service/model/build.scm b/guix-data-service/model/build.scm index 972a16a..a248f44 100644 --- a/guix-data-service/model/build.scm +++ b/guix-data-service/model/build.scm @@ -200,6 +200,7 @@ SELECT DISTINCT ON (builds.id) build_servers.id, build_servers.url, builds.build_server_build_id, + builds.derivation_file_name, build_status.timestamp, build_status.status FROM builds diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm index 78a6da1..1e19b6f 100644 --- a/guix-data-service/web/view/html.scm +++ b/guix-data-service/web/view/html.scm @@ -661,6 +661,7 @@ time." ((build-id build-server-id build-server-url build-server-build-id + derivation-file-name timestamp status) `(div @@ -668,13 +669,13 @@ time." (div (a (@ (href ,(build-url build-server-id build-server-build-id - (second derivation)))) + derivation-file-name))) ,(build-status-span status))) (a (@ (style "display: inline-block; margin-top: 0.4em;") (href ,(build-server-link-url build-server-url build-server-build-id - (second derivation)))) + derivation-file-name))) "View build on " ,build-server-url)))) builds))) (div