Skip to content

fix: pagination #49

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
1379 merged 1 commit into from
Dec 3, 2022
Merged

fix: pagination #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion resources/template/theme/default-theme-anatole
Open in desktop
Submodule default-theme-anatole updated 5 files
+1 −1 archives.tmpl
+1 −1 category.tmpl
+2 −2 journals.tmpl
+1 −1 search.tmpl
+2 −2 tag.tmpl
2 changes: 1 addition & 1 deletion service/impl/post_tag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (p *postTagServiceImpl) PagePost(ctx context.Context, postQuery param.PostQ
postDo = postDo.Where(postDAL.Status.In(statuesValue...))
}
if postQuery.TagID != nil {
postDo.Join(&entity.PostTag{}, postDAL.ID.EqCol(postTagDAL.PostID)).Where(postTagDAL.ID.Eq(*postQuery.TagID))
postDo.Join(&entity.PostTag{}, postDAL.ID.EqCol(postTagDAL.PostID)).Where(postTagDAL.TagID.Eq(*postQuery.TagID))
}
posts, totalCount, err := postDo.FindByPage(postQuery.PageNum*postQuery.PageSize, postQuery.PageSize)
if err != nil {
Expand Down
14 changes: 7 additions & 7 deletions template/extension/pagination.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (p *paginationExtension) addArchivesPagination() {
if err != nil {
return nil, err
}
return p.getPagination(ctx, page, total, display, prefix, suffix)
return p.getPagination(ctx, page, total, display, "/"+prefix, suffix)
}
p.Template.AddFunc("archivesPagination", archivesPagination)
}
Expand Down Expand Up @@ -81,7 +81,7 @@ func (p *paginationExtension) addTagPostsPagination() {
if err != nil {
return nil, err
}
return p.getPagination(ctx, page, total, display, tagPrefix.(string)+"/"+slug, suffix)
return p.getPagination(ctx, page, total, display, "/"+tagPrefix.(string)+"/"+slug, suffix)
}
p.Template.AddFunc("tagPostsPagination", tagPostsPagination)
}
Expand All @@ -97,7 +97,7 @@ func (p *paginationExtension) addCategoryPostsPagination() {
if err != nil {
return nil, err
}
return p.getPagination(ctx, page, total, display, categoryPrefix.(string)+"/"+slug, suffix)
return p.getPagination(ctx, page, total, display, "/"+categoryPrefix.(string)+"/"+slug, suffix)
}
p.Template.AddFunc("categoryPostsPagination", categoryPostsPagination)
}
Expand All @@ -113,7 +113,7 @@ func (p *paginationExtension) addPhotosPagination() {
if err != nil {
return nil, err
}
return p.getPagination(ctx, page, total, display, prefix, suffix)
return p.getPagination(ctx, page, total, display, "/"+prefix, suffix)
}
p.Template.AddFunc("photosPagination", photosPagination)
}
Expand All @@ -129,7 +129,7 @@ func (p *paginationExtension) addJournalsPagination() {
if err != nil {
return nil, err
}
return p.getPagination(ctx, page, total, display, prefix, suffix)
return p.getPagination(ctx, page, total, display, "/"+prefix, suffix)
}
p.Template.AddFunc("journalsPagination", journalsPagination)
}
Expand All @@ -154,12 +154,12 @@ func (p *paginationExtension) getPagination(ctx context.Context, page, total, di

rainbow := util.RainbowPage(page+1, total, display)

rainbowPages := make([]vo.RainbowPage, len(rainbow), len(rainbow))
rainbowPages := make([]vo.RainbowPage, len(rainbow))

nextPageFullPath += prefix + "/page/" + strconv.Itoa(page+2) + suffix

if page == 1 {
prevPageFullPath += "/"
prevPageFullPath += prefix + "/"
} else {
prevPageFullPath += prefix + "/page/" + strconv.Itoa(page) + suffix
}
Expand Down