diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2023-05-21 10:16:25 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2023-05-21 10:16:25 +0200 |
| commit | e6dc8053bfb94063268fa56404ff076208dc6dc2 (patch) | |
| tree | c54e079e2ec89e01a11fb0460c332198789213b9 | |
| parent | 2637b4ef4dbb3f8d3e537f900bdd072b4078c87e (diff) | |
| download | hugo-e6dc8053bfb94063268fa56404ff076208dc6dc2.tar.gz hugo-e6dc8053bfb94063268fa56404ff076208dc6dc2.zip | |
commands: Fix build logic when listing expired/future draft content
Fixes #10972
| -rw-r--r-- | commands/list.go | 16 | ||||
| -rw-r--r-- | testscripts/commands/list.txt | 17 |
2 files changed, 30 insertions, 3 deletions
diff --git a/commands/list.go b/commands/list.go index 1ce45987b..05739c7a9 100644 --- a/commands/list.go +++ b/commands/list.go @@ -73,7 +73,11 @@ func newListCommand() *listCommand { p.PublishDate().Format(time.RFC3339)} } - return list(cd, r, createRecord, "buildDrafts", true) + return list(cd, r, createRecord, + "buildDrafts", true, + "buildFuture", true, + "buildExpired", true, + ) }, }, &simpleCommand{ @@ -91,7 +95,10 @@ func newListCommand() *listCommand { } } - return list(cd, r, createRecord, "buildFuture", true) + return list(cd, r, createRecord, + "buildFuture", true, + "buildDrafts", true, + ) }, }, &simpleCommand{ @@ -109,7 +116,10 @@ func newListCommand() *listCommand { } } - return list(cd, r, createRecord, "buildExpired", true) + return list(cd, r, createRecord, + "buildExpired", true, + "buildDrafts", true, + ) }, }, &simpleCommand{ diff --git a/testscripts/commands/list.txt b/testscripts/commands/list.txt index 68d1097d7..2e64389fa 100644 --- a/testscripts/commands/list.txt +++ b/testscripts/commands/list.txt @@ -3,17 +3,23 @@ hugo list drafts ! stderr . stdout 'draft.md,2019-01-01T00:00:00Z' +stdout 'draftexpired.md,2018-01-01T00:00:00Z' +stdout 'draftfuture.md,2030-01-01T00:00:00Z' hugo list future stdout 'future.md,2030-01-01T00:00:00Z' +stdout 'draftfuture.md,2030-01-01T00:00:00Z' hugo list expired stdout 'expired.md,2018-01-01T00:00:00Z' +stdout 'draftexpired.md,2018-01-01T00:00:00Z' hugo list all stdout 'future.md,2030-01-01T00:00:00Z' stdout 'draft.md,2019-01-01T00:00:00Z' stdout 'expired.md,2018-01-01T00:00:00Z' +stdout 'draftexpired.md,2018-01-01T00:00:00Z' +stdout 'draftfuture.md,2030-01-01T00:00:00Z' -- hugo.toml -- baseURL = "https://example.org/" @@ -31,4 +37,15 @@ expiryDate: 2019-01-01 -- content/future.md -- --- date: 2030-01-01 +--- +-- content/draftfuture.md -- +--- +date: 2030-01-01 +draft: true +--- +-- content/draftexpired.md -- +--- +date: 2018-01-01 +expiryDate: 2019-01-01 +draft: true ---
\ No newline at end of file |