From 50f550d6429b6297daa264d3924a1123710eaebd Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 27 Dec 2019 10:13:34 +0000 Subject: [PATCH] Link to the versions page from the latest revision package page --- guix-data-service/web/repository/controller.scm | 7 ++++++- guix-data-service/web/revision/controller.scm | 7 +++++-- guix-data-service/web/revision/html.scm | 9 ++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/guix-data-service/web/repository/controller.scm b/guix-data-service/web/repository/controller.scm index ffa9e40..5838d24 100644 --- a/guix-data-service/web/repository/controller.scm +++ b/guix-data-service/web/repository/controller.scm @@ -255,7 +255,12 @@ (string-append "/repository/" repository-id "/branch/" branch-name - "/latest-processed-revision")) + "/latest-processed-revision") + #:version-history-link + (string-append + "/repository/" repository-id + "/branch/" branch-name + "/package/" name)) (render-unknown-revision mime-types conn commit-hash)))) diff --git a/guix-data-service/web/revision/controller.scm b/guix-data-service/web/revision/controller.scm index 90416df..197919f 100644 --- a/guix-data-service/web/revision/controller.scm +++ b/guix-data-service/web/revision/controller.scm @@ -548,7 +548,8 @@ (samp ,commit-hash))) (header-link (string-append - "/revision/" commit-hash))) + "/revision/" commit-hash)) + version-history-link) (let ((metadata (select-package-metadata-by-revision-name-and-version conn @@ -600,7 +601,9 @@ git-repositories lint-warnings #:header-text header-text - #:header-link header-link) + #:header-link header-link + #:version-history-link + version-history-link) #:extra-headers http-headers-for-unchanging-content))))) (define* (render-revision-derivations mime-types diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm index c50c487..5f74cb4 100644 --- a/guix-data-service/web/revision/html.scm +++ b/guix-data-service/web/revision/html.scm @@ -159,7 +159,8 @@ derivations git-repositories lint-warnings #:key header-text - header-link) + header-link + version-history-link) (layout #:body `(,(header) @@ -175,6 +176,12 @@ (@ (class "row")) (div (@ (class "col-sm-12")) + ,@(if version-history-link + `((a (@ (class "btn btn-lg btn-default pull-right") + (href ,version-history-link) + (role "button")) + "Version history")) + '()) (h1 "Package " ,name " @ " ,version))) (div (@ (class "row"))