Skip to content

Fix wiki page list not rendering after UpdatedUnix changes #3175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2017
Merged

Fix wiki page list not rendering after UpdatedUnix changes #3175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c6e5c7
Fix wiki page list not rendering after updatedunix changes
lafriks Dec 12, 2017
e920f02
Merge branch 'master' into fix/creating_wiki_updateunix
lunny Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions routers/repo/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"io/ioutil"
"path/filepath"
"strings"
"time"

"code.gitea.io/git"

Expand All @@ -19,6 +18,7 @@ import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/util"
)

const (
Expand All @@ -45,9 +45,9 @@ func MustEnableWiki(ctx *context.Context) {

// PageMeta wiki page meat information
type PageMeta struct {
Name string
SubURL string
Updated time.Time
Name string
SubURL string
UpdatedUnix util.TimeStamp
}

// findEntryForFile finds the tree entry for a target filepath.
Expand Down Expand Up @@ -266,9 +266,9 @@ func WikiPages(ctx *context.Context) {
return
}
pages = append(pages, PageMeta{
Name: wikiName,
SubURL: models.WikiNameToSubURL(wikiName),
Updated: c.Author.When,
Name: wikiName,
SubURL: models.WikiNameToSubURL(wikiName),
UpdatedUnix: util.TimeStamp(c.Author.When.Unix()),
})
}
ctx.Data["Pages"] = pages
Expand Down