refactor: wiki edit form (#38918)

1. the fragile `document.querySelector('.repository.wiki.new
.ui.form')!` is broken (again), rewrite to "data-global-init"
    * regression from #37571 because a new form was added
3. use "form-fetch-action" and JSON response instead of
"RenderWithErrDeprecated"
This commit is contained in:
wxiaoguang
2026-08-14 17:31:23 +08:00
committed by GitHub
parent befeacdf7d
commit b6368965fb
10 changed files with 127 additions and 159 deletions
+23 -37
View File
@@ -27,7 +27,6 @@ import (
"gitea.dev/modules/templates" "gitea.dev/modules/templates"
"gitea.dev/modules/timeutil" "gitea.dev/modules/timeutil"
"gitea.dev/modules/util" "gitea.dev/modules/util"
"gitea.dev/modules/web"
"gitea.dev/routers/common" "gitea.dev/routers/common"
"gitea.dev/services/context" "gitea.dev/services/context"
"gitea.dev/services/forms" "gitea.dev/services/forms"
@@ -639,6 +638,16 @@ func WikiRaw(ctx *context.Context) {
ctx.NotFound(nil) ctx.NotFound(nil)
} }
func wikiHandleEditError(ctx *context.Context, wikiName wiki_service.WebPath, err error) {
if repo_model.IsErrWikiReservedName(err) {
ctx.JSONErrorWithField(ctx.Tr("repo.wiki.reserved_page", wikiName), "title")
} else if repo_model.IsErrWikiAlreadyExist(err) {
ctx.JSONErrorWithField(ctx.Tr("repo.wiki.page_already_exists"), "title")
} else {
ctx.ServerError("EditWiki", err)
}
}
// NewWiki render wiki create page // NewWiki render wiki create page
func NewWiki(ctx *context.Context) { func NewWiki(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page")
@@ -655,41 +664,25 @@ func NewWiki(ctx *context.Context) {
// NewWikiPost response for wiki create request // NewWikiPost response for wiki create request
func NewWikiPost(ctx *context.Context) { func NewWikiPost(ctx *context.Context) {
form := web.GetForm[*forms.NewWikiForm](ctx) form := context.GetFetchActionForm[*forms.WikiEditForm](ctx)
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") if form == nil {
if ctx.HasError() {
ctx.HTML(http.StatusOK, tplWikiNew)
return
}
if util.IsEmptyString(form.Title) {
ctx.RenderWithErrDeprecated(ctx.Tr("repo.issues.new.title_empty"), tplWikiNew, form)
return return
} }
wikiName := wiki_service.UserTitleToWebPath("", form.Title) wikiName := wiki_service.UserTitleToWebPath("", form.Title)
if form.Message == "" {
if len(form.Message) == 0 {
form.Message = ctx.Locale.TrString("repo.editor.add", form.Title) form.Message = ctx.Locale.TrString("repo.editor.add", form.Title)
} }
if err := wiki_service.AddWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, wikiName, form.Content, form.Message); err != nil { err := wiki_service.AddWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, wikiName, form.Content, form.Message)
if repo_model.IsErrWikiReservedName(err) { if err != nil {
ctx.Data["Err_Title"] = true wikiHandleEditError(ctx, wikiName, err)
ctx.RenderWithErrDeprecated(ctx.Tr("repo.wiki.reserved_page", wikiName), tplWikiNew, &form)
} else if repo_model.IsErrWikiAlreadyExist(err) {
ctx.Data["Err_Title"] = true
ctx.RenderWithErrDeprecated(ctx.Tr("repo.wiki.page_already_exists"), tplWikiNew, &form)
} else {
ctx.ServerError("AddWikiPage", err)
}
return return
} }
notify_service.NewWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, string(wikiName), form.Message) notify_service.NewWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, string(wikiName), form.Message)
ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.WebPathToURLPath(wikiName)) ctx.JSONRedirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.WebPathToURLPath(wikiName))
} }
// EditWiki render wiki modify page // EditWiki render wiki modify page
@@ -711,38 +704,31 @@ func EditWiki(ctx *context.Context) {
// EditWikiPost response for wiki modify request // EditWikiPost response for wiki modify request
func EditWikiPost(ctx *context.Context) { func EditWikiPost(ctx *context.Context) {
form := web.GetForm[*forms.NewWikiForm](ctx) form := context.GetFetchActionForm[*forms.WikiEditForm](ctx)
ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") if form == nil {
if ctx.HasError() {
ctx.HTML(http.StatusOK, tplWikiNew)
return return
} }
oldWikiName := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*")) oldWikiName := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*"))
newWikiName := wiki_service.UserTitleToWebPath("", form.Title) newWikiName := wiki_service.UserTitleToWebPath("", form.Title)
if form.Message == "" {
if len(form.Message) == 0 {
form.Message = ctx.Locale.TrString("repo.editor.update", form.Title) form.Message = ctx.Locale.TrString("repo.editor.update", form.Title)
} }
if err := wiki_service.EditWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, oldWikiName, newWikiName, form.Content, form.Message); err != nil { if err := wiki_service.EditWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, oldWikiName, newWikiName, form.Content, form.Message); err != nil {
ctx.ServerError("EditWikiPage", err) wikiHandleEditError(ctx, newWikiName, err)
return return
} }
notify_service.EditWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, string(newWikiName), form.Message) notify_service.EditWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, string(newWikiName), form.Message)
ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.WebPathToURLPath(newWikiName)) ctx.JSONRedirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.WebPathToURLPath(newWikiName))
} }
// DeleteWikiPagePost delete wiki page // DeleteWikiPagePost delete wiki page
func DeleteWikiPagePost(ctx *context.Context) { func DeleteWikiPagePost(ctx *context.Context) {
wikiName := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*")) wikiName := wiki_service.WebPathFromRequest(ctx.PathParamRaw("*"))
if len(wikiName) == 0 { wikiName = util.IfZero(wikiName, "Home")
wikiName = "Home"
}
if err := wiki_service.DeleteWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, wikiName); err != nil { if err := wiki_service.DeleteWikiPage(ctx, ctx.Doer, ctx.Repo.Repository, wikiName); err != nil {
ctx.ServerError("DeleteWikiPage", err) ctx.ServerError("DeleteWikiPage", err)
return return
+68 -74
View File
@@ -4,6 +4,7 @@
package repo package repo
import ( import (
"fmt"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
@@ -12,9 +13,8 @@ import (
repo_model "gitea.dev/models/repo" repo_model "gitea.dev/models/repo"
"gitea.dev/models/unittest" "gitea.dev/models/unittest"
"gitea.dev/modules/git" "gitea.dev/modules/git"
"gitea.dev/modules/web" "gitea.dev/modules/test"
"gitea.dev/services/contexttest" "gitea.dev/services/contexttest"
"gitea.dev/services/forms"
repo_service "gitea.dev/services/repository" repo_service "gitea.dev/services/repository"
wiki_service "gitea.dev/services/wiki" wiki_service "gitea.dev/services/wiki"
@@ -23,16 +23,15 @@ import (
) )
const ( const (
content = "Wiki contents for unit tests" testWikiContent = "Wiki contents for unit tests"
message = "Wiki commit message for unit tests" testWikiMessage = "Wiki commit message for unit tests"
) )
func wikiEntry(t *testing.T, repo *repo_model.Repository, wikiName wiki_service.WebPath) (*git.Repository, *git.TreeEntry) { func wikiEntry(t *testing.T, repo *repo_model.Repository, wikiName wiki_service.WebPath) (*git.Repository, *git.TreeEntry) {
wikiRepo, err := git.OpenRepository(t.Context(), repo.WikiStorageRepo()) wikiRepo, err := git.OpenRepository(t.Context(), repo.WikiStorageRepo())
assert.NoError(t, err) require.NoError(t, err)
t.Cleanup(func() { defer wikiRepo.Close()
defer wikiRepo.Close()
})
commit, err := wikiRepo.GetBranchCommit(t.Context(), "master") commit, err := wikiRepo.GetBranchCommit(t.Context(), "master")
assert.NoError(t, err) assert.NoError(t, err)
entries, err := commit.Tree().ListEntries(t.Context(), wikiRepo) entries, err := commit.Tree().ListEntries(t.Context(), wikiRepo)
@@ -81,25 +80,35 @@ func assertPagesMetas(t *testing.T, expectedNames []string, metas any) {
func TestWiki(t *testing.T) { func TestWiki(t *testing.T) {
unittest.PrepareTestEnv(t) unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki") t.Run("Home", func(t *testing.T) {
ctx.SetPathParam("*", "Home") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki")
contexttest.LoadRepo(t, ctx, 1) ctx.SetPathParam("*", "Home")
Wiki(ctx) contexttest.LoadRepo(t, ctx, 1)
assert.Equal(t, http.StatusOK, ctx.Resp.WrittenStatus()) Wiki(ctx)
assert.EqualValues(t, "Home", ctx.Data["Title"]) assert.Equal(t, http.StatusOK, ctx.Resp.WrittenStatus())
assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"]) assert.EqualValues(t, "Home", ctx.Data["Title"])
assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
ctx, _ = contexttest.MockContext(t, "user2/repo1/jpeg.jpg") })
ctx.SetPathParam("*", "jpeg.jpg") t.Run("Image", func(t *testing.T) {
contexttest.LoadRepo(t, ctx, 1) ctx, _ := contexttest.MockContext(t, "user2/repo1/jpeg.jpg")
Wiki(ctx) ctx.SetPathParam("*", "jpeg.jpg")
assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus()) contexttest.LoadRepo(t, ctx, 1)
assert.Equal(t, "/user2/repo1/wiki/raw/jpeg.jpg", ctx.Resp.Header().Get("Location")) Wiki(ctx)
assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
assert.Equal(t, "/user2/repo1/wiki/raw/jpeg.jpg", ctx.Resp.Header().Get("Location"))
})
t.Run("Pages", testWikiPages)
t.Run("NewWiki", testNewWiki)
t.Run("NewWikiPost", testNewWikiPost)
t.Run("NewWikiPostReservedName", testNewWikiPostReservedName)
t.Run("EditWiki", testEditWiki)
t.Run("EditWikiPost", testEditWikiPost)
t.Run("DeletePost", testDeleteWikiPagePost)
t.Run("Raw", testWikiRaw)
t.Run("DefaultWikiBranch", testDefaultWikiBranch)
} }
func TestWikiPages(t *testing.T) { func testWikiPages(t *testing.T) {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_pages") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_pages")
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
WikiPages(ctx) WikiPages(ctx)
@@ -107,9 +116,7 @@ func TestWikiPages(t *testing.T) {
assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"]) assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
} }
func TestNewWiki(t *testing.T) { func testNewWiki(t *testing.T) {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new")
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
@@ -118,48 +125,42 @@ func TestNewWiki(t *testing.T) {
assert.EqualValues(t, ctx.Tr("repo.wiki.new_page"), ctx.Data["Title"]) assert.EqualValues(t, ctx.Tr("repo.wiki.new_page"), ctx.Data["Title"])
} }
func TestNewWikiPost(t *testing.T) { func testNewWikiPost(t *testing.T) {
for _, title := range []string{ for _, title := range []string{
"New page", "New page",
"&&&&", "&&&&",
} { } {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new")
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
web.SetForm(ctx, &forms.NewWikiForm{ contexttest.MockRequestPostForm(ctx.Req, url.Values{
Title: title, "title": []string{title},
Content: content, "content": []string{testWikiContent},
Message: message, "message": []string{testWikiMessage},
}) })
NewWikiPost(ctx) NewWikiPost(ctx)
assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus()) assert.Equal(t, http.StatusOK, ctx.Resp.WrittenStatus())
assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)) assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))) assert.Equal(t, testWikiContent, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
} }
} }
func TestNewWikiPost_ReservedName(t *testing.T) { func testNewWikiPostReservedName(t *testing.T) {
unittest.PrepareTestEnv(t) ctx, resp := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new")
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_new")
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
web.SetForm(ctx, &forms.NewWikiForm{ contexttest.MockRequestPostForm(ctx.Req, url.Values{
Title: "_edit", "title": []string{"_edit"},
Content: content, "content": []string{testWikiContent},
Message: message, "message": []string{testWikiMessage},
}) })
NewWikiPost(ctx) NewWikiPost(ctx)
assert.Equal(t, http.StatusOK, ctx.Resp.WrittenStatus()) assert.Equal(t, http.StatusBadRequest, ctx.Resp.WrittenStatus())
assert.EqualValues(t, ctx.Tr("repo.wiki.reserved_page", "_edit"), ctx.Flash.ErrorMsg) assert.EqualValues(t, ctx.Tr("repo.wiki.reserved_page", "_edit"), test.ParseJSONError(resp.Body.Bytes()).ErrorMessage)
assertWikiNotExists(t, ctx.Repo.Repository, "_edit") assertWikiNotExists(t, ctx.Repo.Repository, "_edit")
} }
func TestEditWiki(t *testing.T) { func testEditWiki(t *testing.T) {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/Home?action=_edit") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/Home?action=_edit")
ctx.SetPathParam("*", "Home") ctx.SetPathParam("*", "Home")
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
@@ -177,34 +178,31 @@ func TestEditWiki(t *testing.T) {
assert.Equal(t, http.StatusForbidden, ctx.Resp.WrittenStatus()) assert.Equal(t, http.StatusForbidden, ctx.Resp.WrittenStatus())
} }
func TestEditWikiPost(t *testing.T) { func testEditWikiPost(t *testing.T) {
for _, title := range []string{ const existingPageTitle = "Page With Image"
"Home", for _, title := range []string{existingPageTitle, "New/<page>"} {
"New/<page>",
} {
unittest.PrepareTestEnv(t) unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/Home?action=_new") ctx, _ := contexttest.MockContext(t, fmt.Sprintf("/user2/repo1/wiki/%s?action=_new", url.PathEscape(existingPageTitle)))
ctx.SetPathParam("*", "Home") ctx.SetPathParam("*", existingPageTitle)
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
web.SetForm(ctx, &forms.NewWikiForm{ contexttest.MockRequestPostForm(ctx.Req, url.Values{
Title: title, "title": []string{title},
Content: content, "content": []string{testWikiContent},
Message: message, "message": []string{testWikiMessage},
}) })
assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", existingPageTitle))
EditWikiPost(ctx) EditWikiPost(ctx)
assert.Equal(t, http.StatusSeeOther, ctx.Resp.WrittenStatus()) assert.Equal(t, http.StatusOK, ctx.Resp.WrittenStatus())
assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)) assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))) assert.Equal(t, testWikiContent, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
if title != "Home" { if title != existingPageTitle {
assertWikiNotExists(t, ctx.Repo.Repository, "Home") assertWikiNotExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", existingPageTitle))
} }
} }
} }
func TestDeleteWikiPagePost(t *testing.T) { func testDeleteWikiPagePost(t *testing.T) {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/Home?action=_delete") ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/Home?action=_delete")
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
contexttest.LoadRepo(t, ctx, 1) contexttest.LoadRepo(t, ctx, 1)
@@ -213,7 +211,7 @@ func TestDeleteWikiPagePost(t *testing.T) {
assertWikiNotExists(t, ctx.Repo.Repository, "Home") assertWikiNotExists(t, ctx.Repo.Repository, "Home")
} }
func TestWikiRaw(t *testing.T) { func testWikiRaw(t *testing.T) {
for filepath, filetype := range map[string]string{ for filepath, filetype := range map[string]string{
"jpeg.jpg": "image/jpeg", "jpeg.jpg": "image/jpeg",
"images/jpeg.jpg": "image/jpeg", "images/jpeg.jpg": "image/jpeg",
@@ -223,8 +221,6 @@ func TestWikiRaw(t *testing.T) {
"Page With Spaced Name.md": "", // there is no "Page With Spaced Name.md" in repo "Page With Spaced Name.md": "", // there is no "Page With Spaced Name.md" in repo
"Page-With-Spaced-Name.md": "text/plain; charset=utf-8", "Page-With-Spaced-Name.md": "text/plain; charset=utf-8",
} { } {
unittest.PrepareTestEnv(t)
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/raw/"+url.PathEscape(filepath)) ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/raw/"+url.PathEscape(filepath))
ctx.SetPathParam("*", filepath) ctx.SetPathParam("*", filepath)
contexttest.LoadUser(t, ctx, 2) contexttest.LoadUser(t, ctx, 2)
@@ -239,9 +235,7 @@ func TestWikiRaw(t *testing.T) {
} }
} }
func TestDefaultWikiBranch(t *testing.T) { func testDefaultWikiBranch(t *testing.T) {
unittest.PrepareTestEnv(t)
// repo with no wiki // repo with no wiki
repoWithNoWiki := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) repoWithNoWiki := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
assert.False(t, repo_service.HasWiki(t.Context(), repoWithNoWiki)) assert.False(t, repo_service.HasWiki(t.Context(), repoWithNoWiki))
+2 -2
View File
@@ -1583,10 +1583,10 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) {
m.Group("/{username}/{reponame}/wiki", func() { m.Group("/{username}/{reponame}/wiki", func() {
m.Combo(""). m.Combo("").
Get(repo.Wiki). Get(repo.Wiki).
Post(context.RepoMustNotBeArchived(), reqSignIn, reqUnitWikiWriter, web.Bind[*forms.NewWikiForm](), repo.WikiPost) Post(context.RepoMustNotBeArchived(), reqSignIn, reqUnitWikiWriter, repo.WikiPost)
m.Combo("/*"). m.Combo("/*").
Get(repo.Wiki). Get(repo.Wiki).
Post(context.RepoMustNotBeArchived(), reqSignIn, reqUnitWikiWriter, web.Bind[*forms.NewWikiForm](), repo.WikiPost) Post(context.RepoMustNotBeArchived(), reqSignIn, reqUnitWikiWriter, repo.WikiPost)
m.Get("/blob_excerpt/{sha}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ExcerptBlob) m.Get("/blob_excerpt/{sha}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.ExcerptBlob)
m.Get("/commit/{sha:[a-f0-9]{7,64}}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.Diff) m.Get("/commit/{sha:[a-f0-9]{7,64}}", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.Diff)
m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff) m.Get("/commit/{sha:[a-f0-9]{7,64}}.{ext:patch|diff}", repo.RawDiff)
+1
View File
@@ -298,6 +298,7 @@ func GetFetchActionForm[T interface {
} }
form := T(new(E)) form := T(new(E))
errs := binding.Bind(ctx.Req, form) errs := binding.Bind(ctx.Req, form)
errs = form.Validate(GetValidateContext(ctx.Req), errs)
errorMessage, fieldName, _ := middleware.BuildValidationErrorForUser(form, ctx.Locale, errs) errorMessage, fieldName, _ := middleware.BuildValidationErrorForUser(form, ctx.Locale, errs)
if errorMessage != "" { if errorMessage != "" {
ctx.Resp.Header().Set("Content-Type", "application/json") ctx.Resp.Header().Set("Content-Type", "application/json")
+11 -18
View File
@@ -558,27 +558,20 @@ type EditReleaseForm struct {
Files []string Files []string
} }
// __ __.__ __ .__ type WikiEditForm struct {
// / \ / \__| | _|__| Title string
// \ \/\/ / | |/ / | Content string
// \ /| | <| |
// \__/\ / |__|__|_ \__|
// \/ \/
// NewWikiForm form for creating wiki
type NewWikiForm struct {
middleware.FormDefaultValidator
Title string `binding:"Required"`
Content string `binding:"Required"`
Message string Message string
} }
// ___________.__ ___________ __ func (f *WikiEditForm) Validate(ctx *middleware.ValidateContext, errs binding.Errors) binding.Errors {
// \__ ___/|__| _____ ____ \__ ___/___________ ____ | | __ ___________ f.Title = strings.TrimSpace(f.Title)
// | | | |/ \_/ __ \ | | \_ __ \__ \ _/ ___\| |/ // __ \_ __ \ if f.Title == "" {
// | | | | Y Y \ ___/ | | | | \// __ \\ \___| <\ ___/| | \/ errs = middleware.AddValidationError(errs, "title", ctx.Locale.TrString("repo.issues.new.title_empty"))
// |____| |__|__|_| /\___ > |____| |__| (____ /\___ >__|_ \\___ >__| }
// \/ \/ \/ \/ \/ \/ f.Message = strings.TrimSpace(f.Message)
return errs
}
// AddTimeManuallyForm form that adds spent time manually. // AddTimeManuallyForm form that adds spent time manually.
type AddTimeManuallyForm struct { type AddTimeManuallyForm struct {
+3 -3
View File
@@ -1,5 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository wiki new"> <div role="main" aria-label="{{.Title}}" class="page-content repository wiki">
{{template "repo/header" .}} {{template "repo/header" .}}
<div class="ui container"> <div class="ui container">
{{template "base/alert" .}} {{template "base/alert" .}}
@@ -9,8 +9,8 @@
<a class="ui tiny primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a> <a class="ui tiny primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a>
{{end}} {{end}}
</div> </div>
<form class="ui form" action="?action={{if .PageIsWikiEdit}}_edit{{else}}_new{{end}}" method="post"> <form class="ui form form-fetch-action" action="?action={{Iif .PageIsWikiEdit "_edit" "_new"}}" method="post" data-global-init="initRepoWikiForm">
<div class="field {{if .Err_Title}}error{{end}}"> <div class="field">
<input name="title" value="{{.title}}" aria-label="{{ctx.Locale.Tr "repo.wiki.page_title"}}" placeholder="{{ctx.Locale.Tr "repo.wiki.page_title"}}" autofocus required> <input name="title" value="{{.title}}" aria-label="{{ctx.Locale.Tr "repo.wiki.page_title"}}" placeholder="{{ctx.Locale.Tr "repo.wiki.page_title"}}" autofocus required>
</div> </div>
<div class="help"> <div class="help">
+2 -2
View File
@@ -1,5 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository wiki view"> <div role="main" aria-label="{{.Title}}" class="page-content repository wiki">
{{template "repo/header" .}} {{template "repo/header" .}}
{{$title := .title}} {{$title := .title}}
<div class="ui container"> <div class="ui container">
@@ -63,7 +63,7 @@
<div class="wiki-content-parts"> <div class="wiki-content-parts">
{{if .WikiSidebarTocHTML}} {{if .WikiSidebarTocHTML}}
<div class="render-content markup wiki-content-sidebar wiki-content-toc"> <div class="render-content markup wiki-content-sidebar wiki-content-toc" data-global-init="initRepoWikiSidebarToc">
{{.WikiSidebarTocHTML}} {{.WikiSidebarTocHTML}}
</div> </div>
{{end}} {{end}}
+3 -3
View File
@@ -54,7 +54,7 @@
<md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list> <md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list>
<md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list> <md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list>
<md-task-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list> <md-task-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list>
<button class="markdown-toolbar-button markdown-button-table-add" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.table.add.tooltip"}}">{{svg "octicon-table"}}</button> <button class="markdown-toolbar-button markdown-button-table-add" type="button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.table.add.tooltip"}}">{{svg "octicon-table"}}</button>
</div> </div>
{{if $mentionsLink}} {{if $mentionsLink}}
<div class="markdown-toolbar-group"> <div class="markdown-toolbar-group">
@@ -63,9 +63,9 @@
</div> </div>
{{end}} {{end}}
<div class="markdown-toolbar-group"> <div class="markdown-toolbar-group">
<button class="markdown-toolbar-button markdown-switch-monospace" role="switch" data-enable-text="{{ctx.Locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{ctx.Locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button> <button class="markdown-toolbar-button markdown-switch-monospace" type="button" role="switch" data-enable-text="{{ctx.Locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{ctx.Locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button>
{{if $supportEasyMDE}} {{if $supportEasyMDE}}
<button class="markdown-toolbar-button markdown-switch-easymde" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button> <button class="markdown-toolbar-button markdown-switch-easymde" type="button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button>
{{end}} {{end}}
</div> </div>
</markdown-toolbar> </markdown-toolbar>
+12 -18
View File
@@ -3,13 +3,11 @@ import {fomanticMobileScreen} from '../modules/fomantic.ts';
import {POST} from '../modules/fetch.ts'; import {POST} from '../modules/fetch.ts';
import type {ComboMarkdownEditor} from './comp/ComboMarkdownEditor.ts'; import type {ComboMarkdownEditor} from './comp/ComboMarkdownEditor.ts';
import {html, htmlRaw} from '../utils/html.ts'; import {html, htmlRaw} from '../utils/html.ts';
import {registerGlobalInitFunc} from '../modules/observer.ts';
async function initRepoWikiFormEditor() { async function initRepoWikiForm(form: HTMLFormElement) {
const editArea = document.querySelector<HTMLTextAreaElement>('.repository.wiki .combo-markdown-editor textarea');
if (!editArea) return;
const form = document.querySelector('.repository.wiki.new .ui.form')!;
const editorContainer = form.querySelector<HTMLElement>('.combo-markdown-editor')!; const editorContainer = form.querySelector<HTMLElement>('.combo-markdown-editor')!;
const editArea = editorContainer.querySelector<HTMLTextAreaElement>('textarea')!;
let editor: ComboMarkdownEditor; let editor: ComboMarkdownEditor;
let renderRequesting = false; let renderRequesting = false;
@@ -69,17 +67,13 @@ async function initRepoWikiFormEditor() {
}); });
} }
function collapseWikiTocForMobile(collapse: boolean) { export function initRepoWiki() {
if (collapse) { registerGlobalInitFunc('initRepoWikiSidebarToc', (el) => {
document.querySelector('.wiki-content-toc details')?.removeAttribute('open'); const collapseWikiTocForMobile = (collapse: boolean) => {
} if (collapse) el.querySelector('details')?.removeAttribute('open');
} };
fomanticMobileScreen.addEventListener('change', (e) => collapseWikiTocForMobile(e.matches));
export function initRepoWikiForm() { collapseWikiTocForMobile(fomanticMobileScreen.matches);
if (!document.querySelector('.page-content.repository.wiki')) return; });
registerGlobalInitFunc('initRepoWikiForm', initRepoWikiForm);
fomanticMobileScreen.addEventListener('change', (e) => collapseWikiTocForMobile(e.matches));
collapseWikiTocForMobile(fomanticMobileScreen.matches);
initRepoWikiFormEditor();
} }
+2 -2
View File
@@ -38,7 +38,7 @@ import {initInstall} from './features/install.ts';
import {initCompWebHookEditor} from './features/comp/WebHookEditor.ts'; import {initCompWebHookEditor} from './features/comp/WebHookEditor.ts';
import {initRepoBranchButton} from './features/repo-branch.ts'; import {initRepoBranchButton} from './features/repo-branch.ts';
import {initCommonOrganization} from './features/common-organization.ts'; import {initCommonOrganization} from './features/common-organization.ts';
import {initRepoWikiForm} from './features/repo-wiki.ts'; import {initRepoWiki} from './features/repo-wiki.ts';
import {initRepository, initBranchSelectorTabs} from './features/repo-legacy.ts'; import {initRepository, initBranchSelectorTabs} from './features/repo-legacy.ts';
import {initCaptcha} from './features/captcha.ts'; import {initCaptcha} from './features/captcha.ts';
import {initRepositoryActions} from './features/repo-actions.ts'; import {initRepositoryActions} from './features/repo-actions.ts';
@@ -135,7 +135,7 @@ const initPerformanceTracer = callInitFunctions([
initRepoReleaseNew, initRepoReleaseNew,
initRepoTopicBar, initRepoTopicBar,
initRepoViewFileTree, initRepoViewFileTree,
initRepoWikiForm, initRepoWiki,
initRepository, initRepository,
initRepositoryActions, initRepositoryActions,
initRepositorySearch, initRepositorySearch,