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

Add default datetimes for compare-by-datetime

Browse source 
As this makes it easy to compare the current state of two branches.
This commit is contained in:
Christopher Baines 2020-11-21 20:04:10 +00:00
parent 7321ce4408
commit 12f35c493b
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
guix-data-service/web/compare/controller.scm
View file

@ -18,6 +18,7 @@
(define-module (guix-data-service web compare controller) (define-module (guix-data-service web compare controller)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-19)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 vlist) #:use-module (ice-9 vlist)
#:use-module (texinfo) #:use-module (texinfo)
@ -99,9 +100,11 @@
(parse-query-parameters (parse-query-parameters
request request
`((base_branch ,identity #:required) `((base_branch ,identity #:required)
(base_datetime ,parse-datetime #:required) (base_datetime ,parse-datetime
#:default ,(current-date))
(target_branch ,identity #:required) (target_branch ,identity #:required)
(target_datetime ,parse-datetime #:required) (target_datetime ,parse-datetime
#:default ,(current-date))
(locale ,identity #:default "en_US.UTF-8"))))) (locale ,identity #:default "en_US.UTF-8")))))
(render-compare-by-datetime mime-types (render-compare-by-datetime mime-types
parsed-query-parameters))) parsed-query-parameters)))
@ -139,9 +142,11 @@
(parse-query-parameters (parse-query-parameters
request request
`((base_branch ,identity #:required) `((base_branch ,identity #:required)
(base_datetime ,parse-datetime #:required) (base_datetime ,parse-datetime
#:default ,(current-date))
(target_branch ,identity #:required) (target_branch ,identity #:required)
(target_datetime ,parse-datetime #:required) (target_datetime ,parse-datetime
#:default ,(current-date))
(system ,parse-system #:multi-value) (system ,parse-system #:multi-value)
(target ,parse-target #:multi-value) (target ,parse-target #:multi-value)
(build_status ,parse-build-status #:multi-value) (build_status ,parse-build-status #:multi-value)

4
guix-data-service/web/compare/html.scm
View file

@ -136,7 +136,6 @@
#:font-family "monospace") #:font-family "monospace")
(form-horizontal-control (form-horizontal-control
"Base datetime" query-parameters "Base datetime" query-parameters
#:required? #t
#:help-text "The date and time to compare from." #:help-text "The date and time to compare from."
#:font-family "monospace") #:font-family "monospace")
(form-horizontal-control (form-horizontal-control
@ -146,7 +145,6 @@
#:font-family "monospace") #:font-family "monospace")
(form-horizontal-control (form-horizontal-control
"Target datetime" query-parameters "Target datetime" query-parameters
#:required? #t
#:help-text "The date and time to compare to." #:help-text "The date and time to compare to."
#:font-family "monospace"))) #:font-family "monospace")))
(else (else
@ -902,7 +900,6 @@ enough builds to determine a change")))
#:font-family "monospace") #:font-family "monospace")
,(form-horizontal-control ,(form-horizontal-control
"Base datetime" query-parameters "Base datetime" query-parameters
#:required? #t
#:help-text "The date and time to compare from." #:help-text "The date and time to compare from."
#:font-family "monospace") #:font-family "monospace")
,(form-horizontal-control ,(form-horizontal-control
@ -912,7 +909,6 @@ enough builds to determine a change")))
#:font-family "monospace") #:font-family "monospace")
,(form-horizontal-control ,(form-horizontal-control
"Target datetime" query-parameters "Target datetime" query-parameters
#:required? #t
#:help-text "The date and time to compare to." #:help-text "The date and time to compare to."
#:font-family "monospace") #:font-family "monospace")
,(form-horizontal-control ,(form-horizontal-control