From 9928a286ec35eaac15df7b2fec1f97c5ee12c457 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Thu, 23 Mar 2023 18:55:32 +0800
Subject: [PATCH 1/4] Fix buttons in project edit page not work

---
 routers/web/org/projects.go      | 1 +
 routers/web/repo/projects.go     | 1 +
 templates/projects/new.tmpl      | 2 +-
 templates/repo/projects/new.tmpl | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index df16d0a4c762..4b30b770e9e6 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -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")
diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
index e15f548a38dc..91e17dee295f 100644
--- a/routers/web/repo/projects.go
+++ b/routers/web/repo/projects.go
@@ -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
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index 826869ac5daa..a8f549c1e0a1 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -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 button" href="/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 						{{.locale.Tr "repo.milestones.cancel"}}
 					</a>
 					<button class="ui primary button">
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index b53a47dc58e6..00e586149020 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -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 button" href="{{.RepoLink}}/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 						{{.locale.Tr "repo.milestones.cancel"}}
 					</a>
 					<button class="ui primary button">

From 3b66848c7d8ffd1b71a04eb94e3513dc5b7e0272 Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Thu, 23 Mar 2023 20:15:12 +0800
Subject: [PATCH 2/4] fix

---
 templates/projects/new.tmpl          | 2 +-
 templates/repo/projects/new.tmpl     | 2 +-
 web_src/js/features/common-global.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index a8f549c1e0a1..96bee0332619 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -50,7 +50,7 @@
 				<div class="ui divider"></div>
 				<div class="ui left">
 					{{if .PageIsEditProjects}}
-					<a class="ui button" href="/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
+					<a class="ui cancel button" href="/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 						{{.locale.Tr "repo.milestones.cancel"}}
 					</a>
 					<button class="ui primary button">
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index 00e586149020..20c4d2ebfc64 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -72,7 +72,7 @@
 				<div class="ui divider"></div>
 				<div class="ui left">
 					{{if .PageIsEditProjects}}
-					<a class="ui button" href="{{.RepoLink}}/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
+					<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">
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index 113ff2e1f159..9efc9eacd819 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -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();
   });
 

From d8da9673fec31064f2e354dd4f92162e7635d19b Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Fri, 24 Mar 2023 11:18:01 +0800
Subject: [PATCH 3/4] add AppSubUrl

---
 templates/projects/new.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index 96bee0332619..f93c71f4ce8f 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -50,7 +50,7 @@
 				<div class="ui divider"></div>
 				<div class="ui left">
 					{{if .PageIsEditProjects}}
-					<a class="ui cancel button" href="/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
+					<a class="ui cancel button" href="{{AppSubUrl}}/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 						{{.locale.Tr "repo.milestones.cancel"}}
 					</a>
 					<button class="ui primary button">

From 80da6461679a84948e770656f640d5bd59d3e26b Mon Sep 17 00:00:00 2001
From: sillyguodong <gedong_1994@163.com>
Date: Fri, 24 Mar 2023 13:36:12 +0800
Subject: [PATCH 4/4] add `homelink` into context data

---
 routers/web/org/projects.go | 1 +
 templates/projects/new.tmpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index 4b30b770e9e6..5d8005781d41 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -249,6 +249,7 @@ func EditProject(ctx *context.Context) {
 	ctx.Data["title"] = p.Title
 	ctx.Data["content"] = p.Description
 	ctx.Data["redirect"] = ctx.FormString("redirect")
+	ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink()
 
 	ctx.HTML(http.StatusOK, tplProjectsNew)
 }
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index f93c71f4ce8f..e7927221a810 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -50,7 +50,7 @@
 				<div class="ui divider"></div>
 				<div class="ui left">
 					{{if .PageIsEditProjects}}
-					<a class="ui cancel button" href="{{AppSubUrl}}/{{.Org.Name}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
+					<a class="ui cancel button" href="{{$.HomeLink}}/-/projects{{if eq .redirect "project"}}/{{.projectID}}{{end}}">
 						{{.locale.Tr "repo.milestones.cancel"}}
 					</a>
 					<button class="ui primary button">