Hri7566
/
gitea
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix cancel button in the page of project edit not work (#23655) 

Before, in project edit page, the cancel button is not work.

https://user-images.githubusercontent.com/33891828/227182731-6478e29f-0e52-48c4-beb0-6a7d1dda6a1d.mov

1. The wrong classname `cancel` was added to the `<a>` tag. That
classname caused the default click event of `<a>` tag to be cancelled.
Because we have the following settings in the global. So I remove the
classname `cancel`.

9be90a5875/web_src/js/features/common-global.js (L325-L327)

2. Another change is that page will redirect to the previous page.

https://user-images.githubusercontent.com/33891828/227187326-c653c6d6-9715-440f-a732-ba0a6f012c81.mov
This commit is contained in:
sillyguodong 2023-03-24 16:37:56 +08:00 committed by GitHub
parent a9cceb0597
commit d02e83a2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/org/projects.go
View File

@ -245,9 +245,11 @@ func EditProject(ctx *context.Context) {
return return
} }
ctx.Data["projectID"] = p.ID
ctx.Data["title"] = p.Title ctx.Data["title"] = p.Title
ctx.Data["content"] = p.Description ctx.Data["content"] = p.Description
ctx.Data["redirect"] = ctx.FormString("redirect") ctx.Data["redirect"] = ctx.FormString("redirect")
ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink()
ctx.HTML(http.StatusOK, tplProjectsNew) ctx.HTML(http.StatusOK, tplProjectsNew)
} }

1
routers/web/repo/projects.go
View File

@ -232,6 +232,7 @@ func EditProject(ctx *context.Context) {
return return
} }
ctx.Data["projectID"] = p.ID
ctx.Data["title"] = p.Title ctx.Data["title"] = p.Title
ctx.Data["content"] = p.Description ctx.Data["content"] = p.Description
ctx.Data["card_type"] = p.CardType ctx.Data["card_type"] = p.CardType

2
templates/projects/new.tmpl
View File

@ -50,7 +50,7 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui left"> <div class="ui left">
{{if .PageIsEditProjects}} {{if .PageIsEditProjects}}
<a class="ui cancel button" href="{{.RepoLink}}/projects"> <a class="ui cancel button" href="{{$.HomeLink}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
{{.locale.Tr "repo.milestones.cancel"}} {{.locale.Tr "repo.milestones.cancel"}}
</a> </a>
<button class="ui primary button"> <button class="ui primary button">

2
templates/repo/projects/new.tmpl
View File

@ -72,7 +72,7 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui left"> <div class="ui left">
{{if .PageIsEditProjects}} {{if .PageIsEditProjects}}
<a class="ui cancel button" href="{{.RepoLink}}/projects"> <a class="ui cancel button" href="{{.RepoLink}}/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
{{.locale.Tr "repo.milestones.cancel"}} {{.locale.Tr "repo.milestones.cancel"}}
</a> </a>
<button class="ui primary button"> <button class="ui primary button">

2
web_src/js/features/common-global.js
View File

@ -322,7 +322,7 @@ export function initGlobalButtons() {
// There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form. // There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form.
// However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission. // However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission.
// There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content") // There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content")
$(document).on('click', 'form .ui.cancel.button', (e) => { $(document).on('click', 'form button.ui.cancel.button', (e) => {
e.preventDefault(); e.preventDefault();
}); });