Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Mar 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9928a28
Fix buttons in project edit page not work
sillyguodong Mar 23, 2023
3b66848
fix
sillyguodong Mar 23, 2023
d8da967
add AppSubUrl
sillyguodong Mar 24, 2023
a9f153c
Merge branch 'main' into bugfix/project_cance_editl_btn
lunny Mar 24, 2023
80da646
add `homelink` into context data
sillyguodong Mar 24, 2023
3234df1
Merge branch 'bugfix/project_cance_editl_btn' of github.com:sillyguod…
sillyguodong Mar 24, 2023
d1f54a4
Merge branch 'main' into bugfix/project_cance_editl_btn
lunny Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions routers/web/org/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ func EditProject(ctx *context.Context) {
return
}

ctx.Data["projectID"] = p.ID
ctx.Data["title"] = p.Title
ctx.Data["content"] = p.Description
ctx.Data["redirect"] = ctx.FormString("redirect")
Expand Down
1 change: 1 addition & 0 deletions routers/web/repo/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ func EditProject(ctx *context.Context) {
return
}

ctx.Data["projectID"] = p.ID
ctx.Data["title"] = p.Title
ctx.Data["content"] = p.Description
ctx.Data["card_type"] = p.CardType
Expand Down
2 changes: 1 addition & 1 deletion templates/projects/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<div class="ui divider"></div>
<div class="ui left">
{{if .PageIsEditProjects}}
<a class="ui cancel button" href="{{.RepoLink}}/projects">
<a class="ui cancel button" href="/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
lunny marked this conversation as resolved.
Show resolved Hide resolved
{{.locale.Tr "repo.milestones.cancel"}}
</a>
<button class="ui primary button">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/projects/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<div class="ui divider"></div>
<div class="ui left">
{{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"}}
</a>
<button class="ui primary button">
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/common-global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,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.
// 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")
$(document).on('click', 'form .ui.cancel.button', (e) => {
$(document).on('click', 'form button.ui.cancel.button', (e) => {
e.preventDefault();
});

Expand Down