mirror of
https://github.com/go-gitea/gitea
synced 2024-12-22 15:34:11 +01:00
Add an trailing slash to dashboard links (#29555)
Fix #29533, and add some tests for "base/paginate.tmpl"
This commit is contained in:
parent
77e29e0c39
commit
8553b4600e
5 changed files with 32 additions and 9 deletions
|
@ -9,7 +9,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// MockLocale provides a mocked locale without any translations
|
// MockLocale provides a mocked locale without any translations
|
||||||
type MockLocale struct{}
|
type MockLocale struct {
|
||||||
|
Lang, LangName string // these fields are used directly in templates: ctx.Locale.Lang
|
||||||
|
}
|
||||||
|
|
||||||
var _ Locale = (*MockLocale)(nil)
|
var _ Locale = (*MockLocale)(nil)
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,7 @@ func Match(tags ...language.Tag) language.Tag {
|
||||||
// locale represents the information of localization.
|
// locale represents the information of localization.
|
||||||
type locale struct {
|
type locale struct {
|
||||||
i18n.Locale
|
i18n.Locale
|
||||||
Lang, LangName string // these fields are used directly in templates: .i18n.Lang
|
Lang, LangName string // these fields are used directly in templates: ctx.Locale.Lang
|
||||||
msgPrinter *message.Printer
|
msgPrinter *message.Printer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,8 @@ import (
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/templates"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/contexttest"
|
"code.gitea.io/gitea/services/contexttest"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -113,3 +115,18 @@ func TestMilestonesForSpecificRepo(t *testing.T) {
|
||||||
assert.Len(t, ctx.Data["Milestones"], 1)
|
assert.Len(t, ctx.Data["Milestones"], 1)
|
||||||
assert.Len(t, ctx.Data["Repos"], 2) // both repo 42 and 1 have milestones and both are owned by user 2
|
assert.Len(t, ctx.Data["Repos"], 2) // both repo 42 and 1 have milestones and both are owned by user 2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDashboardPagination(t *testing.T) {
|
||||||
|
ctx, _ := contexttest.MockContext(t, "/", contexttest.MockContextOption{Render: templates.HTMLRenderer()})
|
||||||
|
page := context.NewPagination(10, 3, 1, 3)
|
||||||
|
|
||||||
|
setting.AppSubURL = "/SubPath"
|
||||||
|
out, err := ctx.RenderToHTML("base/paginate", map[string]any{"Link": setting.AppSubURL, "Page": page})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Contains(t, out, `<a class=" item navigation" href="/SubPath/?page=2">`)
|
||||||
|
|
||||||
|
setting.AppSubURL = ""
|
||||||
|
out, err = ctx.RenderToHTML("base/paginate", map[string]any{"Link": setting.AppSubURL, "Page": page})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Contains(t, out, `<a class=" item navigation" href="/?page=2">`)
|
||||||
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ import (
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
access_model "code.gitea.io/gitea/models/perm/access"
|
access_model "code.gitea.io/gitea/models/perm/access"
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
@ -61,7 +62,8 @@ func MockContext(t *testing.T, reqPath string, opts ...MockContextOption) (*cont
|
||||||
base.Locale = &translation.MockLocale{}
|
base.Locale = &translation.MockLocale{}
|
||||||
|
|
||||||
ctx := context.NewWebContext(base, opt.Render, nil)
|
ctx := context.NewWebContext(base, opt.Render, nil)
|
||||||
|
ctx.PageData = map[string]any{}
|
||||||
|
ctx.Data["PageStartTime"] = time.Now()
|
||||||
chiCtx := chi.NewRouteContext()
|
chiCtx := chi.NewRouteContext()
|
||||||
ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
|
ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
|
||||||
return ctx, resp
|
return ctx, resp
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
{{$paginationLink := .Page.GetParams}}
|
{{$paginationParams := .Page.GetParams}}
|
||||||
|
{{$paginationLink := $.Link}}
|
||||||
|
{{if eq $paginationLink AppSubUrl}}{{$paginationLink = print $paginationLink "/"}}{{end}}
|
||||||
{{with .Page.Paginater}}
|
{{with .Page.Paginater}}
|
||||||
{{if gt .TotalPages 1}}
|
{{if gt .TotalPages 1}}
|
||||||
<div class="center page buttons">
|
<div class="center page buttons">
|
||||||
<div class="ui borderless pagination menu">
|
<div class="ui borderless pagination menu">
|
||||||
<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$.Link}}{{if $paginationLink}}?{{$paginationLink}}{{end}}"{{end}}>
|
<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$paginationLink}}{{if $paginationParams}}?{{$paginationParams}}{{end}}"{{end}}>
|
||||||
{{svg "gitea-double-chevron-left" 16 "gt-mr-2"}}
|
{{svg "gitea-double-chevron-left" 16 "gt-mr-2"}}
|
||||||
<span class="navigation_label">{{ctx.Locale.Tr "admin.first_page"}}</span>
|
<span class="navigation_label">{{ctx.Locale.Tr "admin.first_page"}}</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
|
<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$paginationLink}}?page={{.Previous}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
|
||||||
{{svg "octicon-chevron-left" 16 "gt-mr-2"}}
|
{{svg "octicon-chevron-left" 16 "gt-mr-2"}}
|
||||||
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.previous"}}</span>
|
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.previous"}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
@ -15,14 +17,14 @@
|
||||||
{{if eq .Num -1}}
|
{{if eq .Num -1}}
|
||||||
<a class="disabled item">...</a>
|
<a class="disabled item">...</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<a class="{{if .IsCurrent}}active {{end}}item gt-content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
|
<a class="{{if .IsCurrent}}active {{end}}item gt-content-center" {{if not .IsCurrent}}href="{{$paginationLink}}?page={{.Num}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>{{.Num}}</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
|
<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$paginationLink}}?page={{.Next}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
|
||||||
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.next"}}</span>
|
<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.next"}}</span>
|
||||||
{{svg "octicon-chevron-right" 16 "gt-ml-2"}}
|
{{svg "octicon-chevron-right" 16 "gt-ml-2"}}
|
||||||
</a>
|
</a>
|
||||||
<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$.Link}}?page={{.TotalPages}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
|
<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$paginationLink}}?page={{.TotalPages}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
|
||||||
<span class="navigation_label">{{ctx.Locale.Tr "admin.last_page"}}</span>
|
<span class="navigation_label">{{ctx.Locale.Tr "admin.last_page"}}</span>
|
||||||
{{svg "gitea-double-chevron-right" 16 "gt-ml-2"}}
|
{{svg "gitea-double-chevron-right" 16 "gt-ml-2"}}
|
||||||
</a>
|
</a>
|
||||||
|
|
Loading…
Reference in a new issue