From 9554b45f8a939d0e95873cbef8b8d625524e69f0 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sat, 14 Dec 2019 15:27:59 +0100 Subject: [PATCH] Show the file basename for a variant --- Handler/Query.hs | 4 ++-- templates/query-result.hamlet | 2 +- templates/submission-header.hamlet | 4 ++++ templates/view-variant.hamlet | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Handler/Query.hs b/Handler/Query.hs index 3c930b7..ab93854 100644 --- a/Handler/Query.hs +++ b/Handler/Query.hs @@ -249,8 +249,8 @@ resultTable (Entity submissionId submission) = do $(widgetFile "result-table") -submissionHeader :: FullSubmissionInfo -> WidgetFor App () -submissionHeader submission = +submissionHeader :: FullSubmissionInfo -> Maybe Text -> WidgetFor App () +submissionHeader submission mVariantName = $(widgetFile "submission-header") where commitSha1AsText = fromSHA1ToText $ submissionCommit $ fsiSubmission submission submitter = formatSubmitter $ fsiUser submission diff --git a/templates/query-result.hamlet b/templates/query-result.hamlet index 57bff94..acbd89f 100644 --- a/templates/query-result.hamlet +++ b/templates/query-result.hamlet @@ -3,7 +3,7 @@

- ^{submissionHeader submission} + ^{submissionHeader submission Nothing} ^{resultTable (Entity (fsiSubmissionId submission) (fsiSubmission submission))} $if not (null (fsiSuperSubmissions submission)) diff --git a/templates/submission-header.hamlet b/templates/submission-header.hamlet index f5b68e6..0e7609f 100644 --- a/templates/submission-header.hamlet +++ b/templates/submission-header.hamlet @@ -26,3 +26,7 @@ #{fromMaybe (externalLinkUrl externalLink) (externalLinkTitle externalLink)}
+ $maybe variant <- mVariantName +
file basename +
#{variant} + $nothing diff --git a/templates/view-variant.hamlet b/templates/view-variant.hamlet index 323939b..3e5ea2d 100644 --- a/templates/view-variant.hamlet +++ b/templates/view-variant.hamlet @@ -3,7 +3,7 @@

- ^{submissionHeader fullSubmissionInfo} + ^{submissionHeader fullSubmissionInfo (Just $ variantName variant)} $case tableEntryParams entry $of []