cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build links on the derivation page

Browse source 
In the case where the build is for a different derivation with the same
outputs.
This commit is contained in:
Christopher Baines 2020-11-20 21:01:09 +00:00
parent 00c84640c5
commit 3e15900c56
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
guix-data-service/model/build.scm
View file

@ -200,6 +200,7 @@ SELECT DISTINCT ON (builds.id)
build_servers.id, build_servers.id,
build_servers.url, build_servers.url,
builds.build_server_build_id, builds.build_server_build_id,
builds.derivation_file_name,
build_status.timestamp, build_status.timestamp,
build_status.status build_status.status
FROM builds FROM builds

5
guix-data-service/web/view/html.scm
View file

@ -661,6 +661,7 @@ time."
((build-id build-server-id ((build-id build-server-id
build-server-url build-server-url
build-server-build-id build-server-build-id
derivation-file-name
timestamp timestamp
status) status)
`(div `(div
@ -668,13 +669,13 @@ time."
(div (div
(a (@ (href ,(build-url build-server-id (a (@ (href ,(build-url build-server-id
build-server-build-id build-server-build-id
(second derivation)))) derivation-file-name)))
,(build-status-span status))) ,(build-status-span status)))
(a (@ (style "display: inline-block; margin-top: 0.4em;") (a (@ (style "display: inline-block; margin-top: 0.4em;")
(href ,(build-server-link-url (href ,(build-server-link-url
build-server-url build-server-url
build-server-build-id build-server-build-id
(second derivation)))) derivation-file-name)))
"View build on " ,build-server-url)))) "View build on " ,build-server-url))))
builds))) builds)))
(div (div