diff options
| author | zeripath <art27@cantab.net> | 2020-12-24 21:54:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-24 21:54:15 +0000 |
| commit | bf1441b1e126b315bb14f2c56a2515d43f909384 (patch) | |
| tree | 2e5be0b3fe30bf274ef8be08ddcb8984229c251f | |
| parent | fae18bdac0a6a291ea6d06b77fe568bda6e87cf7 (diff) | |
| download | gitea-bf1441b1e126b315bb14f2c56a2515d43f909384.tar.gz gitea-bf1441b1e126b315bb14f2c56a2515d43f909384.zip | |
Ensure that search term and page are not lost on adoption page-turn (#14133) (#14143)
Backport #14133
Fix #14111
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | routers/admin/repos.go | 11 | ||||
| -rw-r--r-- | templates/admin/repo/unadopted.tmpl | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 10abaf9547..f100ca0642 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -5,6 +5,8 @@ package admin import ( + "net/url" + "strconv" "strings" "code.gitea.io/gitea/models" @@ -71,6 +73,8 @@ func UnadoptedRepos(ctx *context.Context) { opts.Page = 1 } + ctx.Data["CurrentPage"] = opts.Page + doSearch := ctx.QueryBool("search") ctx.Data["search"] = doSearch @@ -79,6 +83,7 @@ func UnadoptedRepos(ctx *context.Context) { if !doSearch { pager := context.NewPagination(0, opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) + pager.AddParam(ctx, "search", "search") ctx.Data["Page"] = pager ctx.HTML(200, tplUnadoptedRepos) return @@ -92,6 +97,7 @@ func UnadoptedRepos(ctx *context.Context) { ctx.Data["Dirs"] = repoNames pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) + pager.AddParam(ctx, "search", "search") ctx.Data["Page"] = pager ctx.HTML(200, tplUnadoptedRepos) } @@ -100,6 +106,9 @@ func UnadoptedRepos(ctx *context.Context) { func AdoptOrDeleteRepository(ctx *context.Context) { dir := ctx.Query("id") action := ctx.Query("action") + page := ctx.QueryInt("page") + q := ctx.Query("q") + dirSplit := strings.SplitN(dir, "/", 2) if len(dirSplit) != 2 { ctx.Redirect(setting.AppSubURL + "/admin/repos") @@ -141,5 +150,5 @@ func AdoptOrDeleteRepository(ctx *context.Context) { } ctx.Flash.Success(ctx.Tr("repo.delete_preexisting_success", dir)) } - ctx.Redirect(setting.AppSubURL + "/admin/repos/unadopted") + ctx.Redirect(setting.AppSubURL + "/admin/repos/unadopted?search=true&q=" + url.QueryEscape(q) + "&page=" + strconv.Itoa(page)) } diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 7a046c6026..38dddf38dc 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -41,6 +41,8 @@ {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="adopt"> + <input type="hidden" name="q" value="{{$.Keyword}}"> + <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> <i class="remove icon"></i> @@ -66,6 +68,8 @@ {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="delete"> + <input type="hidden" name="q" value="{{$.Keyword}}"> + <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> <i class="remove icon"></i> |