+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 863dbd791d6c..203bd3cede0c 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -99,12 +99,22 @@
{{$.locale.Tr "repo.projects.column.edit"}}
{{if not .Default}}
-
+
{{svg "octicon-pin"}}
{{$.locale.Tr "repo.projects.column.set_default"}}
{{else}}
-
+
{{svg "octicon-pin"}}
{{$.locale.Tr "repo.projects.column.unset_default"}}
@@ -143,33 +153,16 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index ec31259b7d36..ee9461724984 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -126,34 +126,24 @@ export function initRepoProject() {
});
});
- $(document).on('click', '.set-default-project-board', async function (e) {
- e.preventDefault();
-
- await $.ajax({
- method: 'POST',
- url: $(this).data('url'),
- headers: {
- 'X-Csrf-Token': csrfToken,
- },
- contentType: 'application/json',
- });
-
- window.location.reload();
- });
+ $('.default-project-board-modal').each(function () {
+ const boardColumn = $(this).closest('.board-column');
+ const showButton = $(boardColumn).find('.default-project-board-show');
- $(document).on('click', '.unset-default-project-board', async function (e) {
- e.preventDefault();
+ $(this).find('.default-project-board-button').on('click', function (e) {
+ e.preventDefault();
- await $.ajax({
- method: 'POST',
- url: $(this).data('url'),
- headers: {
- 'X-Csrf-Token': csrfToken,
- },
- contentType: 'application/json',
+ $.ajax({
+ method: 'POST',
+ url: $(showButton).data('url'),
+ headers: {
+ 'X-Csrf-Token': csrfToken,
+ },
+ contentType: 'application/json',
+ }).done(() => {
+ window.location.reload();
+ });
});
-
- window.location.reload();
});
$('.delete-project-board').each(function () {
From 829d2a59701cf74a1d2d8341241df5b1088ea45f Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 13 Apr 2023 06:38:01 +0000
Subject: [PATCH 7/8] update
---
templates/repo/projects/view.tmpl | 2 ++
web_src/js/features/repo-projects.js | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 203bd3cede0c..2ad40d700a3d 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -104,6 +104,7 @@
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
+ data-type="set_default"
data-url="{{$.Link}}/{{.ID}}/default">
{{svg "octicon-pin"}}
{{$.locale.Tr "repo.projects.column.set_default"}}
@@ -114,6 +115,7 @@
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
+ data-type="unset_default"
data-url="{{$.Link}}/{{.ID}}/unsetdefault">
{{svg "octicon-pin"}}
{{$.locale.Tr "repo.projects.column.unset_default"}}
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index ee9461724984..edb8f88d6c68 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -129,8 +129,14 @@ export function initRepoProject() {
$('.default-project-board-modal').each(function () {
const boardColumn = $(this).closest('.board-column');
const showButton = $(boardColumn).find('.default-project-board-show');
+ const commitButton = $(this).find('.default-project-board-button');
- $(this).find('.default-project-board-button').on('click', function (e) {
+ if ($(showButton).data('type') === 'unset_default') {
+ $(commitButton).removeClass('primary');
+ $(commitButton).addClass('red');
+ }
+
+ $(commitButton).on('click', function (e) {
e.preventDefault();
$.ajax({
From 9dd02486ffb346dba1f27b9c33ae9de03530b866 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Wed, 19 Apr 2023 07:26:00 +0000
Subject: [PATCH 8/8] fix lint
---
web_src/js/features/repo-projects.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index edb8f88d6c68..a2679130d70f 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -136,7 +136,7 @@ export function initRepoProject() {
$(commitButton).addClass('red');
}
- $(commitButton).on('click', function (e) {
+ $(commitButton).on('click', (e) => {
e.preventDefault();
$.ajax({