Skip to content

Commit

Permalink
Rename DefaultPageSize => PagerSize
Browse files Browse the repository at this point in the history
This was recently introduced. so no breaking change.

The thing is:

* We do not commonly use the prefix Default* even if it can be overridden in the templates.
* PagerSize makes more sense and is also the term used in the code.
  • Loading branch information
bep committed Jun 9, 2024
1 parent 8cf94ae commit 9f22bc4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions config/allconfig/allconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {

// Legacy paginate values.
if c.Paginate != 0 {
hugo.Deprecate("site config key paginate", "Use paginator.defaultPageSize instead.", "v0.128.0")
c.Pagination.DefaultPageSize = c.Paginate
hugo.Deprecate("site config key paginate", "Use paginator.pagerSize instead.", "v0.128.0")
c.Pagination.PagerSize = c.Paginate
}

if c.PaginatePath != "" {
Expand Down
12 changes: 6 additions & 6 deletions config/allconfig/allconfig_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ func TestPaginationConfigOld(t *testing.T) {
confDe := b.H.Sites[1].Conf.Pagination()

b.Assert(confEn.Path, qt.Equals, "page-en")
b.Assert(confEn.DefaultPageSize, qt.Equals, 10)
b.Assert(confEn.PagerSize, qt.Equals, 10)
b.Assert(confDe.Path, qt.Equals, "page-de")
b.Assert(confDe.DefaultPageSize, qt.Equals, 20)
b.Assert(confDe.PagerSize, qt.Equals, 20)
}

func TestPaginationConfigNew(t *testing.T) {
Expand All @@ -133,7 +133,7 @@ func TestPaginationConfigNew(t *testing.T) {
[languages.en]
weight = 1
[languages.en.pagination]
defaultPageSize = 20
pagerSize = 20
[languages.de]
weight = 2
[languages.de.pagination]
Expand All @@ -147,9 +147,9 @@ func TestPaginationConfigNew(t *testing.T) {
confDe := b.H.Sites[1].Conf.Pagination()

b.Assert(confEn.Path, qt.Equals, "page")
b.Assert(confEn.DefaultPageSize, qt.Equals, 20)
b.Assert(confEn.PagerSize, qt.Equals, 20)
b.Assert(confDe.Path, qt.Equals, "page-de")
b.Assert(confDe.DefaultPageSize, qt.Equals, 10)
b.Assert(confDe.PagerSize, qt.Equals, 10)
}

func TestPaginationConfigDisableAliases(t *testing.T) {
Expand All @@ -158,7 +158,7 @@ func TestPaginationConfigDisableAliases(t *testing.T) {
disableKinds = ["taxonomy", "term"]
[pagination]
disableAliases = true
defaultPageSize = 2
pagerSize = 2
-- layouts/_default/list.html --
{{ $paginator := .Paginate site.RegularPages }}
{{ template "_internal/pagination.html" . }}
Expand Down
4 changes: 2 additions & 2 deletions config/allconfig/alldecoders.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ var allDecoderSetups = map[string]decodeWeight{
key: "pagination",
decode: func(d decodeWeight, p decodeConfig) error {
p.c.Pagination = config.Pagination{
DefaultPageSize: 10,
Path: "page",
PagerSize: 10,
Path: "page",
}
if p.p.IsSet(d.key) {
if err := mapstructure.WeakDecode(p.p.Get(d.key), &p.c.Pagination); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions config/commonConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ func DecodeServer(cfg Provider) (Server, error) {

// Pagination configures the pagination behavior.
type Pagination struct {
// Default number of elements per page in pagination.
DefaultPageSize int
// Default number of elements per pager in pagination.
PagerSize int

// The path element used during pagination.
Path string
Expand Down
2 changes: 1 addition & 1 deletion resources/page/pagination.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func splitPageGroups(pageGroups PagesGroup, size int) []paginatedElement {

func ResolvePagerSize(conf config.AllProvider, options ...any) (int, error) {
if len(options) == 0 {
return conf.Pagination().DefaultPageSize, nil
return conf.Pagination().PagerSize, nil
}

if len(options) > 1 {
Expand Down

0 comments on commit 9f22bc4

Please sign in to comment.