aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2019-11-14 21:20:17 +0000
committerChristopher Baines <mail@cbaines.net>2019-11-14 21:20:17 +0000
commit5fbfc648fdf22bdfaa701c9c8ff6bd7a713a2d40 (patch)
tree33e2482bfb30bf4c874afcf2afcb39ee54a88eec
parent80cd33e07d72da1d0cd3cbf1c8b9934c4472a2ed (diff)
downloaddata-service-5fbfc648fdf22bdfaa701c9c8ff6bd7a713a2d40.tar
data-service-5fbfc648fdf22bdfaa701c9c8ff6bd7a713a2d40.tar.gz
Add more links to store items
On the formatted derivation and derivation comparison pages.
-rw-r--r--guix-data-service/web/compare/html.scm34
-rw-r--r--guix-data-service/web/view/html.scm6
2 files changed, 25 insertions, 15 deletions
diff --git a/guix-data-service/web/compare/html.scm b/guix-data-service/web/compare/html.scm
index 384a559..26c63d6 100644
--- a/guix-data-service/web/compare/html.scm
+++ b/guix-data-service/web/compare/html.scm
@@ -411,10 +411,10 @@
(th "Arguments"))
(tbody
(tr
- (td ,common-builder)
+ (td ,(display-possible-store-item common-builder))
(td (ol
,@(map (lambda (arg)
- `(li ,arg))
+ `(li ,(display-possible-store-item arg)))
common-args))))))
`(table
(@ (class "table"))
@@ -430,20 +430,22 @@
(target-args (assq-ref arguments 'target)))
`((tr
(td ,base)
- (td ,(or base-builder
- common-builder))
+ (td ,(display-possible-store-item
+ (or base-builder
+ common-builder)))
(td (ol
,@(map (lambda (arg)
- `(li ,arg))
+ `(li ,(display-possible-store-item arg)))
(or common-args
base-args)))))
(tr
(td ,target)
- (td ,(or target-builder
- common-builder))
+ (td ,(display-possible-store-item
+ (or target-builder
+ common-builder)))
(td (ol
,@(map (lambda (arg)
- `(li ,arg))
+ `(li ,(display-possible-store-item arg)))
(or common-args
target-args))))))))))))
(h2 "Environment variables")
@@ -460,21 +462,27 @@
(if common-value
`((tr
(td ,name)
- (td ,common-value)))
+ (td ,(display-possible-store-item common-value))))
(let ((base-value (assq-ref values 'base))
(target-value (assq-ref values 'target)))
(if (and base-value target-value)
`((tr
(td (@ (rowspan 2))
,name)
- (td ,base ,base-value))
+ (td ,base ,(display-possible-store-item
+ base-value)))
(tr
- (td ,target ,target-value)))
+ (td ,target ,(display-possible-store-item
+ target-value))))
`((tr
(td ,name)
(td ,@(if base-value
- (list base base-value)
- (list target target-value)))))))))))
+ (list base
+ (display-possible-store-item
+ base-value))
+ (list target
+ (display-possible-store-item
+ target-value))))))))))))
environment-variables))))))))))
(define (compare/derivations query-parameters
diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm
index 560505a..e6de895 100644
--- a/guix-data-service/web/view/html.scm
+++ b/guix-data-service/web/view/html.scm
@@ -787,7 +787,7 @@
(@ (style "margin-left: 3em;"))
,@(map (lambda (arg count-down)
`(div "\""
- ,arg
+ ,(display-possible-store-item arg)
"\""
,@(if (eq? count-down 0)
'()
@@ -814,7 +814,9 @@
"("
"\"" ,(assq-ref env-var 'key) "\""
","
- "\"" ,(assq-ref env-var 'value) "\""
+ "\"" ,(display-possible-store-item
+ (assq-ref env-var 'value))
+ "\""
")"))
env-vars
(reverse (iota (length env-vars))))