diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-01-03 10:54:45 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-01-03 10:54:45 +0000 |
| commit | 48cdf102fe9b0b12c4e926d9c0b209d9119c5bb7 (patch) | |
| tree | 1277b3982845cc0a75fddb74867ae346463dca90 /guix-data-service/web | |
| parent | e4762394794e7a67b4480c7d1918a057df8a3f38 (diff) | |
| download | data-service-48cdf102fe9b0b12c4e926d9c0b209d9119c5bb7.tar data-service-48cdf102fe9b0b12c4e926d9c0b209d9119c5bb7.tar.gz | |
Fix various issues linking to builds
Diffstat (limited to 'guix-data-service/web')
| -rw-r--r-- | guix-data-service/web/repository/html.scm | 8 | ||||
| -rw-r--r-- | guix-data-service/web/revision/html.scm | 33 |
2 files changed, 20 insertions, 21 deletions
diff --git a/guix-data-service/web/repository/html.scm b/guix-data-service/web/repository/html.scm index 581178f..314f070 100644 --- a/guix-data-service/web/repository/html.scm +++ b/guix-data-service/web/repository/html.scm @@ -523,9 +523,9 @@ build-server-id))) (dd (a (@ (href - ,(simple-format - #f "/build-server/~A/build?derivation_file_name=~A" + ,(build-url build-server-id + (assoc-ref build "build_server_build_id") derivation-file-name))) ,(build-status-alist->build-icon build)))))) builds))) @@ -773,9 +773,9 @@ build-server-id))) (dd (a (@ (href - ,(simple-format - #f "/build-server/~A/build?derivation_file_name=~A" + ,(build-url build-server-id + (assoc-ref build "build_server_build_id") (assoc-ref build "derivation_file_name")))) ,(build-status-alist->build-icon build)))))) builds))) diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm index 2a1008e..0c4aaf1 100644 --- a/guix-data-service/web/revision/html.scm +++ b/guix-data-service/web/revision/html.scm @@ -297,13 +297,12 @@ (@ (class "list-inline")) ,@(map (lambda (build) `(li - (a (@ (href - ,(simple-format - #f "/build-server/~A/build?derivation_file_name=~A" - (assoc-ref build "build_server_id") - file-name))) - ,(build-status-span - (assoc-ref build "status"))))) + `(a (@ (href ,(build-url + build-server-id + (assoc-ref build + "build_server_build_id") + derivation-file-name))) + ,(build-status-alist->build-icon build)))) builds)))))) derivations))))) (div @@ -922,11 +921,11 @@ (lambda (build) (let ((build-server-id (assoc-ref build "build_server_id"))) - `(a (@ (href - ,(simple-format - #f "/build-server/~A/build?derivation_file_name=~A" - build-server-id - derivation-file-name))) + `(a (@ (href ,(build-url + build-server-id + (assoc-ref build + "build_server_build_id") + derivation-file-name))) ,(build-status-alist->build-icon build)))) builds))))) system-tests))))))))) @@ -972,11 +971,11 @@ (lambda (build) (let ((build-server-id (assoc-ref build "build_server_id"))) - `(a (@ (href - ,(simple-format - #f "/build-server/~A/build?derivation_file_name=~A" - build-server-id - derivation-file-name))) + `(a (@ (href ,(build-url + build-server-id + (assoc-ref build + "build_server_build_id") + derivation-file-name))) ,(build-status-alist->build-icon build)))) builds))))) channel-instances))))))))) |