fix: pagination

go-sonic · Dec 3, 2022 · ec9c203 · ec9c203
1 parent d07cf6d
commit ec9c203
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/resources/template/theme/default-theme-anatole b/resources/template/theme/default-theme-anatole
diff --git a/service/impl/post_tag.go b/service/impl/post_tag.go
@@ -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 {

diff --git a/template/extension/pagination.go b/template/extension/pagination.go
@@ -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)
 }
@@ -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)
 }
@@ -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)
 }
@@ -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)
 }
@@ -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)
 }
@@ -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
 	}
+1 −1		archives.tmpl
+1 −1		category.tmpl
+2 −2		journals.tmpl
+1 −1		search.tmpl
+2 −2		tag.tmpl